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

Up master with 2.2 #3541

Merged
merged 16 commits into from
Feb 19, 2018
Merged

Up master with 2.2 #3541

merged 16 commits into from
Feb 19, 2018

Conversation

ger-benjamin
Copy link
Member

git merge origin/2.2

llienher and others added 15 commits January 31, 2018 18:02
Update translation file wget path in Makefile

Update desktop_alt app example

Use metadata instead of controller to initialize the parameter

Sync layers with printNativeAngle attribute

Add printNativeAngle in externs metadata

Fix if condition
Add printNativeAngle parameter to the gmf-created print LayerGroup
Fix gmf printNativeAngle when more than one group in the layer tree
Avoid AngularJs error: $compile:multilink Linking Element Multiple Times
Debug login errors and force-password-change message
Was replaced by ngeo Querent and MapQuerent
Enable to configurate the default display of measurements
Remove unused argument dimensions in gmf.Themes.prototype.getBgLayers
@ger-benjamin
Copy link
Member Author

ger-benjamin commented Feb 19, 2018

I've copied manually the change from the print and the authentication because git can't follow the file over the changes (moved from src/directive to src/component/)

@ger-benjamin ger-benjamin merged commit c11d589 into master Feb 19, 2018
@ger-benjamin ger-benjamin deleted the up_master_with_2.2 branch February 19, 2018 12:15
@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.

6 participants