Skip to content

Merge master over c125_annotations branch#3810

Merged
MV88 merged 24 commits intogeosolutions-it:c125_annotationsfrom
MV88:align_28_05_19
May 29, 2019
Merged

Merge master over c125_annotations branch#3810
MV88 merged 24 commits intogeosolutions-it:c125_annotationsfrom
MV88:align_28_05_19

Conversation

@MV88
Copy link
Copy Markdown
Contributor

@MV88 MV88 commented May 28, 2019

Description

This PR updates master over c125_annotations branch solving its conflicts

offtherailz and others added 22 commits May 15, 2019 15:38
…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
# Conflicts:
#	web/client/plugins/ShapeFile.jsx
#	web/client/reducers/__tests__/config-test.js
#	web/client/translations/data.es-ES
@MV88 MV88 requested a review from offtherailz May 28, 2019 13:18
@coveralls
Copy link
Copy Markdown

coveralls commented May 28, 2019

Coverage Status

Coverage decreased (-0.02%) to 81.371% when pulling 51cfb03 on MV88:align_28_05_19 into 78ac320 on geosolutions-it:c125_annotations.

@MV88 MV88 merged commit 2d26c4f into geosolutions-it:c125_annotations May 29, 2019
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.