Merging master to c125_annotations #2732
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
* add the Chinese langu * Fixed chinese language implementation
) - Externalized VirtualScroll functionalities to be reused - implemented wfsTable enhancer to support auto-data fetch/update with virtual scroll - Added to RequestBuilder sortBy and propertyName support - Add wfs to observable to reuse streams - Provided a getLayerJSONFeature (to extend) for a more rational usage of parameters ( old requests had to manage filterObj was containing sort and pagination options) - Set widgetContainer to be traggable only by header ( the cursor now changes where the widget is draggable) - Add sortable and defaultWidth options to FeatureGrid editor enhancer - Add support for columns resize, memorization and reset - tabular view of attribute selection
* Closes geosolutions-it/austrocontrol-C125#26
* Fixes on Mauro's comment
* Fixed split search pattern
…s-it#2646) * Fixes geosolutions-it#2547: upgraded openlayers to 4.6.4 * Fix for tests
* MousePosition degrees template via plugin props * Removed unused import
* Fixes geosolutions-it#2638 * Fixes geosolutions-it#2639 * Fixes geosolutions-it#2640
…related dependencies) (geosolutions-it#2671)
* Fix geosolutions-it#2626 Updated measure tool * revert on test file * Made some changes, added arcs on leaflet * made length formula and showlabel configurable * fixed default config, added documentation * fixed reducer default
…ions-it#2581) * DrawSupport:Replace does not add drawinteraction by default * Add unit tests
…#2693) * Allow animation disable to support vertical toolbars * removed empty lines
…osolutions-it#2641) * Added resize module on quill editor * Added tests * Removed current test path * Updated doc and icon option * Removed icon * Added new tests * Set default iframeIcon to true * Fix ql video innerHTML
…t#2723) * Fix geosolutions-it#2722 add a regex for travis build * updated regex * changed travis build
# Conflicts: # package.json # web/client/components/TOC/fragments/settings/FeatureInfoEditor.jsx # web/client/components/map/leaflet/DrawSupport.jsx # web/client/components/misc/cardgrids/SideCard.jsx # web/client/components/misc/toolbar/Toolbar.jsx # web/client/components/widgets/widget/CounterWidget.jsx # web/client/components/widgets/widget/__tests__/CounterWidget-test.jsx # web/client/plugins/TOCItemsSettings.jsx # web/client/themes/default/icons.less # web/client/themes/default/icons/icons.eot # web/client/themes/default/icons/icons.svg # web/client/themes/default/icons/icons.ttf # web/client/themes/default/icons/icons.woff # web/client/themes/default/less/panels.less # web/client/translations/data.zh-ZH # web/client/utils/FileUtils.js # web/client/utils/__tests__/FileUtils-test.js
ghost
assigned 
mbarto
approved these changes
Mar 13, 2018
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
updated to this commit
Issues
Please check if the PR fulfills these requirements
What kind of change does this PR introduce? (check one with "x", remove the others)
merge master with conflict solving
What is the current behavior? (You can also link to an open issue here)
the c125_annotations branch is not aligned with master
What is the new behavior?
now it is aligned
Does this PR introduce a breaking change? (check one with "x", remove the other)
If this PR contains a breaking change, please describe the impact and migration path for existing applications: ...
Other information:
not sure if the history is being managed correctly
@mbarto can you double check?