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.2 into master #2898

Merged
merged 17 commits into from
Sep 13, 2017
Merged

Merge 2.2 into master #2898

merged 17 commits into from
Sep 13, 2017

Commits on Sep 7, 2017

  1. What's authCtrl.translate?

    @sbrunner
    sbrunner committed Sep 7, 2017
    Configuration menu
    Copy the full SHA
    3b014c7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2881 from camptocamp/fix-forgot 

    What's authCtrl.translate?
    @sbrunner
    sbrunner authored Sep 7, 2017
    Configuration menu
    Copy the full SHA
    0ea9f3e View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2017

  1. Do not freeze background dimensions on init 

    The previous code rewrote the theme dimension rules at init time.

This was wrong since dynamic dimensions should be updated during the
life of the application.
    @gberaudo
    gberaudo committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    9cf2812 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #2889 from camptocamp/dont_freeze_background_dimen… 

    …sions_on_init

Do not freeze background dimensions on init
    @gberaudo
    gberaudo authored Sep 11, 2017
    Configuration menu
    Copy the full SHA
    958fa95 View commit details
    Browse the repository at this point in the history

  3. Simplify and fix scaleselector example

    @fredj
    fredj committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    2a4fec0 View commit details
    Browse the repository at this point in the history

  4. Remove duplicate border

    @fredj
    fredj committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    0edabfe View commit details
    Browse the repository at this point in the history

  5. Remove unnecessary .gmf-search border

    @fredj
    fredj committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    f615ac4 View commit details
    Browse the repository at this point in the history

  6. Fix css media query for small screens (< 768px)

    @fredj
    fredj committed Sep 11, 2017
    Configuration menu
    Copy the full SHA
    45f68b3 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2017

  1. Switch to protocol-agnostic GitHub shortcut url (#2876)

    @pfirpfel
    pfirpfel authored Sep 12, 2017
    Configuration menu
    Copy the full SHA
    682e2ad View commit details
    Browse the repository at this point in the history

  2. Use es6 arrow function and indentation fixes

    @fredj
    fredj committed Sep 12, 2017
    Configuration menu
    Copy the full SHA
    c823957 View commit details
    Browse the repository at this point in the history

  3. Update the overlay position in a postcompose callback 

    To synchronize the position with the kinetic effect occur.
    @fredj
    fredj committed Sep 12, 2017
    Configuration menu
    Copy the full SHA
    88c59c6 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2891 from camptocamp/scaleselector_example 

    Simplify and fix scaleselector example
    @fredj
    fredj authored Sep 12, 2017
    Configuration menu
    Copy the full SHA
    2ebd39a View commit details
    Browse the repository at this point in the history

  5. Merge pull request #2892 from camptocamp/ipad_search 

    searchtext icon overlaps placeholder on ipad
    @fredj
    fredj authored Sep 12, 2017
    Configuration menu
    Copy the full SHA
    a838f1a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2890 from camptocamp/measure_tooltip 

    measure tools tooltip is moving when panning the map
    @fredj
    fredj authored Sep 12, 2017
    Configuration menu
    Copy the full SHA
    732af4b View commit details
    Browse the repository at this point in the history

  7. Enter digest cycle on node collapse

    @fredj
    fredj committed Sep 12, 2017
    Configuration menu
    Copy the full SHA
    0a144cb View commit details
    Browse the repository at this point in the history

  8. Merge pull request #2897 from camptocamp/layertree_collapse 

    Enter digest cycle on node collapse
    @fredj
    fredj authored Sep 12, 2017
    Configuration menu
    Copy the full SHA
    38eb997 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/2.2'

    @fredj
    fredj committed Sep 12, 2017
    Configuration menu
    Copy the full SHA
    1720cb2 View commit details
    Browse the repository at this point in the history