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.

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

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

Conversation

llienher
Copy link
Member

@llienher llienher commented Mar 13, 2018

We are going to move BackgroundLayerMgr in gmf in a new PR after this merge.

For now the CI is not happy with the gmf dependency in ngeo, so the temporary solution is just to hardcode it until I open a new PR with the file moved to the right place in gmf (+ unit tests).

llienher and others added 30 commits February 20, 2018 14:25
- New background group
- General PR cleanup
- Adapt getter for the backgroundlayermanager
Make sure the lines from the contextual menu are never wrapped
* Can set preload value of Tiles (default to 0)

* Remove completely preload param on ol.layer.Tile
Fix ngRepeat track by displayquerygird
…ityslider

Backgroundlayerselector opacityslider
Add rollup to fix missing ol.ext dependencies
Use escaped label as id for querygrid, because id are not unique
…p-supports

Fix ZIndex on first children layers on ol.layer.Group for backgroundselector-opacityslider
@llienher llienher force-pushed the merge_in_2.2 branch 2 times, most recently from 8b09db6 to 95cb40d Compare March 14, 2018 11:48
Copy link
Member

@ger-benjamin ger-benjamin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just adapt the (ex) gmf.BACKGROUNDLAYER_GROUP. (in a next PR)
Thanks

@llienher llienher merged commit a56183d into master Mar 14, 2018
@llienher llienher deleted the merge_in_2.2 branch March 14, 2018 12:46
@sbrunner sbrunner added this to the dummy milestone Apr 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants