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

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

Commits on Jan 31, 2018

  1. Add printNativeAngle parameter to the gmf-created LayerGroup 

    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
    @llienher
    llienher committed Jan 31, 2018
    Configuration menu
    Copy the full SHA
    6c8f665 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2018

  1. Merge pull request #3452 from camptocamp/gmf_print-native-angle 

    Add printNativeAngle parameter to the gmf-created print LayerGroup
    @llienher
    llienher committed Feb 1, 2018
    Configuration menu
    Copy the full SHA
    0536a06 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2018

  1. Set the printNativeAngle only once in gmf

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

  2. Merge pull request #3473 from camptocamp/fix_gmf_printNativeAngle 

    Fix gmf printNativeAngle when more than one group in the layer tree
    @llienher
    llienher committed Feb 2, 2018
    Configuration menu
    Copy the full SHA
    01290a1 View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2018

  1. Debug login modal 

    Avoid AngularJs error: $compile:multilink Linking Element Multiple Times
    @ger-benjamin
    ger-benjamin committed Feb 5, 2018
    Configuration menu
    Copy the full SHA
    f59e9f3 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2018

  1. Display change password on login

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

  2. Merge pull request #3484 from ger-benjamin/debug_login 

    Debug login errors and force-password-change message
    @ger-benjamin
    ger-benjamin committed Feb 8, 2018
    Configuration menu
    Copy the full SHA
    4ff16fd View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2018

  1. Remove unused argument dimensions in gmf.Themes.prototype.getBgLayers

    @arnaud-morvan
    arnaud-morvan committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    0d6dda7 View commit details
    Browse the repository at this point in the history

  2. Enable to configurate the default display of measurements

    @arnaud-morvan
    arnaud-morvan committed Feb 12, 2018
    Configuration menu
    Copy the full SHA
    f756af7 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2018

  1. Change type of binding to allow changes to mergetabs during runtime (#… 

    …3508)
    @pfirpfel
    pfirpfel committed Feb 13, 2018
    Configuration menu
    Copy the full SHA
    b8ad5bd View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2018

  1. Remove useless ngeo Query Service 

    Was replaced by ngeo Querent and MapQuerent
    @ger-benjamin
    ger-benjamin committed Feb 15, 2018
    Configuration menu
    Copy the full SHA
    907cdaf View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2018

  1. Merge pull request #3529 from ger-benjamin/rm_useless_query_service 

    Remove useless ngeo Query Service
    @fredj
    fredj committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    179d420 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #3511 from camptocamp/gmf-drawfeature-show-measure 

    Enable to configurate the default display of measurements
    @arnaud-morvan
    arnaud-morvan committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    8c7b796 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3510 from camptocamp/unused_theme_bg_dimensions 

    Remove unused argument dimensions in gmf.Themes.prototype.getBgLayers
    @arnaud-morvan
    arnaud-morvan committed Feb 16, 2018
    Configuration menu
    Copy the full SHA
    1a44f76 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2018

  1. Merge remote-tracking branch 'origin/2.2' into up_master_with_2.2

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

  2. After merge correction

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