Align master 09 05 19 over c125_annotations #3740
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* autoDetectCORS option for proxy config * Updated axios version to support automatic CORS detection
* Fix geosolutions-it#3682 request to printUrl * add test for printingEnabled False * clean up main.js code
Integration between mapstore and geoserver gs-stable. Waiting f for ovverride functionalities in geosolutions-it#3688
* Epics dev guide - first part (geosolutions-it#3394) * Fixes geosolutions-it#3454 plugins developers documentation
…utions-it#3697) * Fix 3696 Various fixes, utils and drawSupport * Fixed some docs, and removed changes to map plugin
…3651) Fix geosolutions-it#3585 added date-time and time support (geosolutions-it#3651) * Add utc enhancer to the dateTimePicker components + tests * Fix tests for date time * tentative fix for date time tests * remove timezone test * fix timeutils test * update var names and tests * Fix date or time values used in cql filter * fix utcDateWrapper test * Fix date problem with firefox * fix failing test on firefox
…t#3705) * Fix geosolutions-it#3456 action and reducer dev guide * also pushed other minor fixes for other dev guide pieces * fix Immutable Utils doc
…eosolutions-it#3707) * Fix geosolutions-it#3706 Add support for simple GeoJSON to shapefile * add doc * Fix failing test * tentative fix for firefox
… interactive createProject script (geosolutions-it#3701)
…ctly from Style Editor (geosolutions-it#3718) * add control for sld version 1.1.0 and minor update o style editor * updated styles epics * remove comment
…tyle is invalid (geosolutions-it#3719) * enabled settings on layer with error * add documentation for get status
# Conflicts: # package.json # web/client/actions/layers.js # web/client/actions/mapInfo.js # web/client/components/TOC/DefaultLayer.jsx # web/client/components/TOC/__tests__/DefaultLayer-test.jsx # web/client/components/map/openlayers/DrawSupport.jsx # web/client/components/map/openlayers/Feature.jsx # web/client/components/map/openlayers/__tests__/VectorStyle-test.js # web/client/components/mapcontrols/annotations/AnnotationsEditor.jsx # web/client/components/misc/enhancers/draggableComponent.jsx # web/client/components/misc/toolbar/Toolbar.jsx # web/client/components/style/ColorPicker.jsx # web/client/epics/__tests__/annotations-test.js # web/client/epics/__tests__/identify-test.js # web/client/epics/__tests__/layers-test.js # web/client/epics/annotations.js # web/client/epics/identify.js # web/client/epics/layers.js # web/client/epics/maplayout.js # web/client/libs/__tests__/ajax-test.js # web/client/plugins/Annotations.jsx # web/client/plugins/Identify.jsx # web/client/plugins/TOC.jsx # web/client/reducers/__tests__/layers-test.js # web/client/reducers/__tests__/mapInfo-test.js # web/client/selectors/__tests__/annotations-test.js # web/client/selectors/__tests__/layers-test.js # web/client/selectors/annotations.js # web/client/selectors/layers.js # web/client/selectors/mapinfo.js # web/client/stores/StandardStore.js # web/client/themes/default/bootstrap-theme.less # web/client/themes/default/less/panels.less # web/client/translations/data.de-DE # web/client/translations/data.en-US # web/client/translations/data.es-ES # web/client/translations/data.fr-FR # web/client/translations/data.zh-ZH # web/client/utils/__tests__/MapUtils-test.js
ghost
assigned 
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Align master on c125_annotations branch solving conflicts