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

Conversation

fredj
Copy link
Member

@fredj fredj commented Sep 12, 2017

No description provided.

sbrunner and others added 17 commits September 7, 2017 14:08
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.
…sions_on_init

Do not freeze background dimensions on init
To synchronize the position with the kinetic effect occur.
Simplify and fix scaleselector example
searchtext icon overlaps placeholder on ipad
measure tools tooltip is moving when panning the map
Enter digest cycle on node collapse
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.

Looks good except my question.

@@ -33,7 +33,7 @@
"async": "2.5.0",
"bootstrap": "3.3.7",
"clean-css-cli": "4.1.7",
"closure-util": "git://github.com/camptocamp/closure-util#487fac6",
"closure-util": "camptocamp/closure-util#487fac6",
Copy link
Member

Choose a reason for hiding this comment

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

It is working ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes, see #2875

@fredj
Copy link
Member Author

fredj commented Sep 13, 2017

Thanks for the review

@fredj fredj merged commit 3c49eec into master Sep 13, 2017
@fredj fredj deleted the merge_2.2 branch September 13, 2017 06:48
@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