Merge master over c125_annotations branch#3810
Merged
MV88 merged 24 commits intogeosolutions-it:c125_annotationsfrom May 29, 2019
Merged
Merge master over c125_annotations branch#3810MV88 merged 24 commits intogeosolutions-it:c125_annotationsfrom
MV88 merged 24 commits intogeosolutions-it:c125_annotationsfrom
Conversation
…s-it#3741) * Fix geosolutions-it#3456 action and reducers doc updated * fix tests for mapTo action
…-it#3702) * Some improvements to plugins and projects documentation * Added mkdocs for new docs * Improved plugins-howto documentation * Update docs/developer-guide/mapstore-projects.md Co-Authored-By: mbarto <maurobartolomeoli@gmail.com>
…which section is opened (geosolutions-it#3752) * Fix geosolutions-it#3083 User/Group tab selection in Manager page * Adding tests * Clean up commented code * Updating related tests
…utions-it#3766) * Fix geosolutions-it#2231 Readability of username in manager * Resolving responsiveness problem * Adding test * Rectifing copyright year * Fix action-reducers documentation
* update user doc * Fix typos
…tions-it#3780) * Fix geosolutions-it#3450 Added docker files to standard proj * changed the required param and default fro description * changed the error message with specific invalid param * now is using root docker files and folder
…s-it#3734) * Fixes geosolutions-it#3732: createPlugin helper function * Fixed lint issues * Added support for functional components to createPlugin * Improved createPlugin docs * Fixed lint errors
fixed some spanish translations
# Conflicts: # web/client/plugins/ShapeFile.jsx # web/client/reducers/__tests__/config-test.js # web/client/translations/data.es-ES
This file contains hidden or 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
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
This PR updates master over c125_annotations branch solving its conflicts