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 2.3 into master #4422

Merged
merged 13 commits into from
Nov 28, 2018
Merged

Merge 2.3 into master #4422

merged 13 commits into from
Nov 28, 2018

Commits on Nov 23, 2018

  1. Add missing import for jquery-ui touch support

    @gberaudo
    gberaudo committed Nov 23, 2018
    Configuration menu
    Copy the full SHA
    d62af61 View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2018

  1. Merge pull request #4408 from camptocamp/fix_sort_on_touch_devices 

    Add missing import for jquery-ui touch support
    @gberaudo
    gberaudo committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    ff614aa View commit details
    Browse the repository at this point in the history

  2. id is undefined on external layer 

    This happen on a theme switch after adding an external layer
    @sbrunner
    sbrunner committed Nov 26, 2018
    Configuration menu
    Copy the full SHA
    eeeb83e View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2018

  1. Fix layer with no data

    @fredj
    fredj committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    6b8c334 View commit details
    Browse the repository at this point in the history

  2. Revert "Fix only null layer" 

    This reverts commit 85eb6c0.
    @fredj
    fredj committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    6833998 View commit details
    Browse the repository at this point in the history

  3. Fix profile tooltip content on no data

    @fredj
    fredj committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    97abeb3 View commit details
    Browse the repository at this point in the history

  4. Hide hover line on no data

    @fredj
    fredj committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    6eed458 View commit details
    Browse the repository at this point in the history

  5. Use geomapfish-demo.camptocamp.com/2.3

    @fredj
    fredj committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    2bd9ecd View commit details
    Browse the repository at this point in the history

  6. Merge pull request #4414 from camptocamp/profile 

    Fix layer with no data
    @fredj
    fredj committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    9c82ad2 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #4415 from camptocamp/external-theme-switch 

    id is undefined on external layer
    @sbrunner
    sbrunner committed Nov 27, 2018
    Configuration menu
    Copy the full SHA
    bc3aad4 View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2018

  1. Fix JS error after having loaded an external WMS layer

    @sbrunner
    sbrunner committed Nov 28, 2018
    Configuration menu
    Copy the full SHA
    2e230f0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4418 from camptocamp/error 

    Fix JS error after having loaded an external WMS layer
    @sbrunner
    sbrunner committed Nov 28, 2018
    Configuration menu
    Copy the full SHA
    3c23351 View commit details
    Browse the repository at this point in the history

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

    @fredj
    fredj committed Nov 28, 2018
    Configuration menu
    Copy the full SHA
    2588f7a View commit details
    Browse the repository at this point in the history