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

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
@sbrunner
What's authCtrl.translate?
3b014c7
@sbrunner
Merge pull request #2881 from camptocamp/fix-forgot
0ea9f3e 
What's authCtrl.translate?
@gberaudo
Do not freeze background dimensions on init
9cf2812 
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
Merge pull request #2889 from camptocamp/dont_freeze_background_dimen…
958fa95 
…sions_on_init

Do not freeze background dimensions on init
@fredj
Simplify and fix scaleselector example
2a4fec0
@fredj
Remove duplicate border
0edabfe
@fredj
Remove unnecessary .gmf-search border
f615ac4
@fredj
Fix css media query for small screens (< 768px)
45f68b3
@pfirpfel
Switch to protocol-agnostic GitHub shortcut url (#2876)
682e2ad
@fredj
Use es6 arrow function and indentation fixes
c823957
@fredj
Update the overlay position in a postcompose callback
88c59c6 
To synchronize the position with the kinetic effect occur.
@fredj
Merge pull request #2891 from camptocamp/scaleselector_example
2ebd39a 
Simplify and fix scaleselector example
@fredj
Merge pull request #2892 from camptocamp/ipad_search
a838f1a 
searchtext icon overlaps placeholder on ipad
@fredj
Merge pull request #2890 from camptocamp/measure_tooltip
732af4b 
measure tools tooltip is moving when panning the map
@fredj
Enter digest cycle on node collapse
0a144cb
@fredj
Merge pull request #2897 from camptocamp/layertree_collapse
38eb997 
Enter digest cycle on node collapse
@fredj
Merge remote-tracking branch 'origin/2.2'
1720cb2
ger-benjamin
ger-benjamin reviewed Sep 12, 2017
View reviewed changes
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.

package.json
@@ -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
Reviewers

@ger-benjamin ger-benjamin ger-benjamin approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
dummy
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@fredj @ger-benjamin @sbrunner @gberaudo @pfirpfel