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 remote-tracking branch 'origin/2.3' #4091

Merged
merged 42 commits into from Aug 3, 2018
Merged

Merge remote-tracking branch 'origin/2.3' #4091

merged 42 commits into from Aug 3, 2018

Conversation

sbrunner
Copy link
Member

@sbrunner sbrunner commented Aug 3, 2018

No description provided.

sbrunner and others added 30 commits July 18, 2018 12:40
@sbrunner
Removes unwanted hardcoded mobile interface
a652fe5
@sbrunner
Merge pull request #4038 from camptocamp/fts-non-mobile
c76c96f 
Removes unwanted hardcoded mobile interface
@llienher
Fix print layers when opacity background layer is a layer group
90c73e9
@llienher
Merge pull request #4041 from camptocamp/fix_opacity_background_group…
7abbedf 
…_with_print

Fix print layers when opacity background layer is a layer group
@ger-benjamin
Fix position of the query grid (app)
8e74705 
GSGMF-565
@ger-benjamin
Update legend on (map resolution) change
b367836 
GSGMF-517
@llienher
Fix group translation in notifications
f1cf7a8
@ger-benjamin
Inform user if the imported file is not valid
a1666cd 
GSGMF-467
@llienher
Merge pull request #4055 from camptocamp/fix_untranslated_groups_notif
eb2dbec 
Fix group translation in notifications
@ger-benjamin
More visible error for import
6bb6609 
GSGMF-467
@ger-benjamin
Merge pull request #4053 from camptocamp/fix_grid_position
fce9bf8 
Fix position of the query grid (app)
@ger-benjamin
Merge pull request #4054 from camptocamp/load_legend_on_changes
270e09a 
Update legend on (map resolution) change
@ger-benjamin
Merge pull request #4056 from camptocamp/warn_user_invalid_file
086773b 
Inform user if the imported file is not valid
@fredj
Only change the colors when updating an image style
8e6c3cf
@fredj
Merge pull request #4059 from camptocamp/GSGMF-554_2.2
f43908e 
Only change the colors when updating an image style
@fredj
Allow default values for features properties in ngeo.format.FeatureHash
77aa1a2
@fredj
Reset prevX/prevX on every new features read, not on individual featu…
2055e7e 
…re read
@fredj
Merge pull request #4064 from camptocamp/GSGMF-516
85dc568 
Allow default values for features properties in ngeo.format.FeatureHash
@sbrunner
Merge remote-tracking branch 'origin/2.2' into 2.3
7525efe
@fredj
Add defaultValues in ngeox.format.FeatureHashOptions
1e2b2fa
@sbrunner
Merge pull request #4072 from camptocamp/FeatureHashOptions
67f3965 
Add defaultValues in ngeox.format.FeatureHashOptions
@sbrunner
Merge remote-tracking branch 'origin/2.2' into 2.3
8c9e5ed
@sbrunner
Merge pull request #4071 from camptocamp/merge23b
5057f98 
 Merge remote-tracking branch 'origin/2.2' into 2.3
@ger-benjamin
Fix npm params order to build mobile
8c9026c
@ger-benjamin
Merge pull request #4074 from camptocamp/fix_serve_mobile
92238cf 
Fix serve mobile
@ger-benjamin
Metadata display issues - Fix size and position
2cb3dbf 
GSGMF-571
@ger-benjamin
Metadata display issues - Translate title
c73ba32 
GSGMF-571
@ger-benjamin
Fix window-query collapsed view
9585b3d
@ger-benjamin
Metadata display issues - Don't reset size preferences to null
e141850 
GSGMF-571
@ger-benjamin
Merge pull request #4073 from camptocamp/fix_info_window_size_n_position
28ba1ac 
Fix info window size n position
sbrunner and others added 11 commits July 30, 2018 16:27
@sbrunner sbrunner added this to the dummy milestone Aug 3, 2018
@sbrunner sbrunner requested a review from fredj August 3, 2018 11:52
@sbrunner sbrunner force-pushed the merge23 branch 2 times, most recently from 2cf05ff to 0288338 Compare August 3, 2018 12:21
@sbrunner sbrunner merged commit 475a9a7 into master Aug 3, 2018
@sbrunner sbrunner deleted the merge23 branch August 3, 2018 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fredj fredj fredj 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
@sbrunner @fredj @ger-benjamin @arnaud-morvan @llienher