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.3' #3936

Merged
merged 24 commits into from
Jul 27, 2018
Merged

Merge remote-tracking branch 'origin/2.3' #3936

merged 24 commits into from
Jul 27, 2018

Commits on Jul 5, 2018

  1. Send cookies only on https

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

Commits on Jul 6, 2018

  1. Fix the log message

    @sbrunner
    sbrunner committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    ad5ce8a View commit details
    Browse the repository at this point in the history

  2. Secure the plugin against error

    @sbrunner
    sbrunner committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    21a400a View commit details
    Browse the repository at this point in the history

  3. Fix role and restriction area

    @sbrunner
    sbrunner committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    f2f26ff View commit details
    Browse the repository at this point in the history

  4. Fix code style

    @sbrunner
    sbrunner committed Jul 6, 2018
    Configuration menu
    Copy the full SHA
    680b065 View commit details
    Browse the repository at this point in the history

Commits on Jul 16, 2018

  1. Makes docker-compose-run compatible with Windows

    @sbrunner
    sbrunner committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    391c525 View commit details
    Browse the repository at this point in the history

  2. Add editor config file

    @sbrunner
    sbrunner committed Jul 16, 2018
    Configuration menu
    Copy the full SHA
    67d09a5 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2018

  1. Merge pull request #3918 from camptocamp/editorconfig 

    Add editor config file
    @sbrunner
    sbrunner committed Jul 17, 2018
    Configuration menu
    Copy the full SHA
    ec72647 View commit details
    Browse the repository at this point in the history

  2. use variable web_protocol (like in docker template)

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

Commits on Jul 18, 2018

  1. Fix OpenLayers in the admin interface

    @sbrunner
    sbrunner committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    5ff2cbd View commit details
    Browse the repository at this point in the history

  2. Add WMTS queryable zoom limits documentation

    @kalbermattenm
    kalbermattenm committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    8d3ef1b View commit details
    Browse the repository at this point in the history

  3. Don't have dupplicated fulltextsearchUrl

    @sbrunner
    sbrunner committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    954b4ba View commit details
    Browse the repository at this point in the history

  4. Do an xmllint on the jasper report print templates

    @sbrunner
    sbrunner committed Jul 18, 2018
    Configuration menu
    Copy the full SHA
    35c9e46 View commit details
    Browse the repository at this point in the history

Commits on Jul 19, 2018

  1. Merge pull request #3928 from kalbermattenm/doc 

    Add WMTS queryable zoom limits documentation
    @sbrunner
    sbrunner committed Jul 19, 2018
    Configuration menu
    Copy the full SHA
    6ee1702 View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2018

  1. Merge pull request #3921 from camptocamp/small_fix 

    use variable web_protocol (like in docker template)
    @jwkaltz
    jwkaltz committed Jul 20, 2018
    Configuration menu
    Copy the full SHA
    d2f284c View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2018

  1. Merge pull request #3905 from camptocamp/secure-cookie 

    Send cookies only on https
    @sbrunner
    sbrunner committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    26f2b51 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3917 from camptocamp/win 

    Makes docker-compose-run compatible with Windows
    @sbrunner
    sbrunner committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    8356823 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3923 from camptocamp/fix-admin-ol 

    Fix OpenLayers in the admin interface
    @sbrunner
    sbrunner committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    7387f5f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3926 from camptocamp/dupplicate-fulltextsearchUrl 

    Don't have dupplicated fulltextsearchUrl
    @sbrunner
    sbrunner committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    82f675d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3927 from camptocamp/print-xmllint 

    Do an xmllint on the jasper report print templates
    @sbrunner
    sbrunner committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    c9ba016 View commit details
    Browse the repository at this point in the history

  6. Factorise assert plugin initialised

    @sbrunner
    sbrunner committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    88787d7 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #3912 from camptocamp/qgis 

    Fix the QGIS server plugin
    @sbrunner
    sbrunner committed Jul 24, 2018
    Configuration menu
    Copy the full SHA
    fceb9a8 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2018

  1. Merge remote-tracking branch 'origin/2.3'

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

Commits on Jul 27, 2018

  1. Directly use the npm package, update ngeo 

    Fixes for ngeo upgrade
    @sbrunner
    sbrunner committed Jul 27, 2018
    Configuration menu
    Copy the full SHA
    4f34d09 View commit details
    Browse the repository at this point in the history