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 #3651

Merged
merged 36 commits into from
Mar 14, 2018
Merged

Merge 2.2 into master #3651

merged 36 commits into from
Mar 14, 2018

Commits on Feb 20, 2018

  1. Remove unused dimensions in backgroundlayerselector for app and examples

    @llienher
    llienher committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    d136514 View commit details
    Browse the repository at this point in the history

  2. Add config for bgOpacityLayer in desktop_alt, basic UI

    @llienher
    llienher committed Feb 20, 2018
    Configuration menu
    Copy the full SHA
    bf7a0cf View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2018

  1. Add bgOpacityLayer to map

    @llienher
    llienher committed Feb 21, 2018
    Configuration menu
    Copy the full SHA
    de3a620 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2018

  1. Fix compiler errors

    @llienher
    llienher committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    3ac6b09 View commit details
    Browse the repository at this point in the history

  2. Use of getter/setter for the opacity slider ng-model

    @llienher
    llienher committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    76ba203 View commit details
    Browse the repository at this point in the history

  3. Make sure the lines from the contextual menu are never wrapped

    @fredj
    fredj committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    52a120f View commit details
    Browse the repository at this point in the history

  4. Add a background group containing all background layers 

    - New background group
- General PR cleanup
- Adapt getter for the backgroundlayermanager
    @llienher
    llienher committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    a668df5 View commit details
    Browse the repository at this point in the history

  5. Update tests

    @llienher
    llienher committed Feb 22, 2018
    Configuration menu
    Copy the full SHA
    4fe22dd View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2018

  1. Merge pull request #3562 from camptocamp/f_3496 

    Make sure the lines from the contextual menu are never wrapped
    @fredj
    fredj committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    ef5b2da View commit details
    Browse the repository at this point in the history

  2. Fix background group order issue

    @llienher
    llienher committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    53f42e3 View commit details
    Browse the repository at this point in the history

  3. Getter for opacity background layer and tests

    @llienher
    llienher committed Feb 26, 2018
    Configuration menu
    Copy the full SHA
    74c1862 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2018

  1. Add zIndex for background layers, better overlay background set

    @llienher
    llienher committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    b738e64 View commit details
    Browse the repository at this point in the history

  2. Use fa-check icon

    @llienher
    llienher committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    5a022ab View commit details
    Browse the repository at this point in the history

  3. Remove completely preload param on ol.layer.Tile (#3583) 

    * Can set preload value of Tiles (default to 0)

* Remove completely preload param on ol.layer.Tile
    @ger-benjamin
    ger-benjamin committed Feb 27, 2018
    Configuration menu
    Copy the full SHA
    8e06975 View commit details
    Browse the repository at this point in the history

Commits on Feb 28, 2018

  1. Prevent reload of user object during logout for specific user role. (#… 

    …3579)
    @pfirpfel
    pfirpfel committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    9360ebf View commit details
    Browse the repository at this point in the history

  2. Preload for Tiles is configurable now

    @ger-benjamin
    ger-benjamin committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    e23b2ea View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3592 from camptocamp/Option_preload_for_tiles 

    Preload for Tiles is configurable now
    @ger-benjamin
    ger-benjamin committed Feb 28, 2018
    Configuration menu
    Copy the full SHA
    e457608 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2018

  1. Fix set background method if layer is null for zindex property

    @llienher
    llienher committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    c2cb3b5 View commit details
    Browse the repository at this point in the history

  2. Fix ngRepeat track by displayquerygird

    @llienher
    llienher committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    049057c View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3598 from camptocamp/fix_displayquerygrid 

    Fix ngRepeat track by displayquerygird
    @llienher
    llienher committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    3586eef View commit details
    Browse the repository at this point in the history

  4. Merge pull request #3553 from camptocamp/backgroundlayerselector-opac… 

    …ityslider

Backgroundlayerselector opacityslider
    @llienher
    llienher committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    c95d1e4 View commit details
    Browse the repository at this point in the history

  5. Add z-index to popover

    @llienher
    llienher committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    416d3ab View commit details
    Browse the repository at this point in the history

  6. Merge pull request #3602 from camptocamp/popover_zindex 

    Add z-index to popover
    @llienher
    llienher committed Mar 1, 2018
    Configuration menu
    Copy the full SHA
    4824343 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2018

  1. Add support for ol.layer.Group ZIndex on first children layers

    @llienher
    llienher committed Mar 2, 2018
    Configuration menu
    Copy the full SHA
    d3cf5ee View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2018

  1. Add rollup to fix missing ol.ext dependencies

    @ger-benjamin
    ger-benjamin committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    8a6bd69 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3621 from camptocamp/fix_22 

    Add rollup to fix missing ol.ext dependencies
    @ger-benjamin
    ger-benjamin committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    869faa8 View commit details
    Browse the repository at this point in the history

  3. Use escaped label as id for querygrid, because id are not unique 

    GEO-1022
    @ger-benjamin
    ger-benjamin committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    38e6989 View commit details
    Browse the repository at this point in the history

  4. Fix mergeTab usage (missing export tag) 

    GEO-977
    @ger-benjamin
    ger-benjamin committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    701ca96 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3622 from camptocamp/fix_displayquerygrid_display 

    Use escaped label as id for querygrid, because id are not unique
    @ger-benjamin
    ger-benjamin committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    fdcdef9 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. Merge pull request #3610 from camptocamp/backgroundopacityslider_grou… 

    …p-supports

Fix ZIndex on first children layers on ol.layer.Group for backgroundselector-opacityslider
    @llienher
    llienher committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    2f7a064 View commit details
    Browse the repository at this point in the history

  2. Add maxzoom for permalink search

    @llienher
    llienher committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    4fa181b View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3648 from camptocamp/permalink-search-maxzoom 

    Add maxzoom for permalink search
    @llienher
    llienher committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    4957daf View commit details
    Browse the repository at this point in the history

  4. Print - Selected scale must not be auto. adapted 

    GEO-1051
    @ger-benjamin
    ger-benjamin committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    484e609 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #3649 from camptocamp/selected_scale_must_not_change 

    Print - Selected scale must not be auto. adapted
    @ger-benjamin
    ger-benjamin committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    5ad6ec9 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2018

  1. Fix conflicts

    @llienher
    llienher committed Mar 13, 2018
    2 Configuration menu
    Copy the full SHA
    164c75d View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. Remove ununsed require and gmf dependency in ngeo

    @llienher
    llienher committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    841cae4 View commit details
    Browse the repository at this point in the history