Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge remote-tracking branch 'origin/2.2' into 2.3 #3960

Merged
merged 17 commits into from
Aug 3, 2018
Merged

Merge remote-tracking branch 'origin/2.2' into 2.3 #3960

merged 17 commits into from
Aug 3, 2018

Commits on Jul 17, 2018

  1. remove index-url to pypi.camptocamp.net, as server is no longer maint… 

    …ained
    @jwkaltz
    jwkaltz committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    b4e9898 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2018

  1. Merge pull request #3920 from camptocamp/1_6_without_pypi_camptocamp 

    [1.6] remove index-url to pypi.camptocamp.net
    @jwkaltz
    jwkaltz committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    d3ab4e9 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2018

  1. disable tests with postgres etc. (version used by c2cgeoportal 1.6 is… 

    … no longer supported)
    @jwkaltz
    jwkaltz committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    9bf7830 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2018

  1. review feedback

    @jwkaltz
    jwkaltz committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    481e53b View commit details
    Browse the repository at this point in the history

  2. need facter for make build

    @jwkaltz
    jwkaltz committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    71a030a View commit details
    Browse the repository at this point in the history

  3. need another package for msgfmt (used by build)

    @jwkaltz
    jwkaltz committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    78eba35 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3934 from camptocamp/1_6_fix_travis 

    1.6 fix travis
    @jwkaltz
    jwkaltz committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    ed06d42 View commit details
    Browse the repository at this point in the history

  5. Do release 1.6.14

    @jwkaltz
    jwkaltz committed Jul 25, 2018
    Configuration menu
    Copy the full SHA
    6845b3c View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2018

  1. small precisions about update process

    @jwkaltz
    jwkaltz committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    473d526 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3935 from camptocamp/doc_1_6 

    [doc] small precisions about update process
    @jwkaltz
    jwkaltz committed Jul 26, 2018
    Configuration menu
    Copy the full SHA
    8804639 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2018

  1. small fix

    @jwkaltz
    jwkaltz committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    c46e9a5 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3944 from camptocamp/1_6_doc_small_fix 

    small fix
    @jwkaltz
    jwkaltz committed Jul 30, 2018
    Configuration menu
    Copy the full SHA
    0faab17 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2018

  1. Merge remote-tracking branch 'origin/1.6' into 2.1

    @sbrunner
    sbrunner committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    9d16cf9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3958 from camptocamp/merge16 

    Merge remote-tracking branch 'origin/1.6' into 2.1
    @sbrunner
    sbrunner committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    f6e9958 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/2.1' into 2.2

    @sbrunner
    sbrunner committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    cc4bb69 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3959 from camptocamp/merge21 

    Merge21
    @sbrunner
    sbrunner committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    0116e53 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/2.2' into 2.3

    @sbrunner
    sbrunner committed Aug 3, 2018
    Configuration menu
    Copy the full SHA
    e81d890 View commit details
    Browse the repository at this point in the history