Skip to content

Commit

Permalink
Updated to 2022.02.02 (#43)
Browse files Browse the repository at this point in the history
  • Loading branch information
offtherailz authored Dec 13, 2022
1 parent 7c35798 commit 72e611b
Showing 11 changed files with 255 additions and 321 deletions.
2 changes: 1 addition & 1 deletion MapStore2
Submodule MapStore2 updated 41 files
+10 −0 CHANGELOG.md
+1 −1 binary/bin-war/pom.xml
+3 −1 build/devServer.js
+1 −1 docs/developer-guide/integrations/users/geoserver.md
+41 −29 docs/developer-guide/maps-configuration.md
+1 −1 docs/index.md
+2 −2 docs/user-guide/catalog.md
+1 −1 docs/user-guide/exploring-dashboards.md
+1 −1 docs/user-guide/home-page.md
+ docs/user-guide/img/widgets/table-attribute.gif
+ docs/user-guide/img/widgets/table-description.gif
+ docs/user-guide/img/widgets/table-ex.jpg
+ docs/user-guide/img/widgets/table-panel.jpg
+ docs/user-guide/img/widgets/table-title.gif
+13 −1 docs/user-guide/widgets.md
+1 −1 java/pom.xml
+1 −1 java/printing/pom.xml
+1 −1 java/services/pom.xml
+2 −2 java/web/pom.xml
+1 −1 package.json
+1 −1 pom.xml
+2 −2 product/pom.xml
+1 −1 project/standard/templates/web/pom.xml
+0 −2 web/client/components/data/download/DownloadDialog.jsx
+3 −1 web/client/components/geostory/common/MapEditor.jsx
+3 −2 web/client/components/geostory/common/map/Controls.jsx
+8 −1 web/client/components/geostory/contents/carousel/carouselItem/ItemThumbnail.jsx
+4 −1 web/client/components/maps/forms/Thumbnail.jsx
+5 −5 web/client/components/styleeditor/config/blocks.js
+1 −2 web/client/components/styleeditor/config/property.js
+249 −32 web/client/epics/__tests__/queryparam-test.js
+8 −11 web/client/epics/queryparams.js
+2 −1 web/client/plugins/GeoStory.jsx
+2 −0 web/client/translations/data.de-DE.json
+2 −0 web/client/translations/data.en-US.json
+2 −0 web/client/translations/data.es-ES.json
+2 −0 web/client/translations/data.fr-FR.json
+11 −9 web/client/translations/data.it-IT.json
+1 −0 web/client/translations/data.nl-NL.json
+1 −0 web/client/translations/data.sk-SK.json
+19 −3 web/client/utils/QueryParamsUtils.js
12 changes: 0 additions & 12 deletions backend/pom.xml
Original file line number Diff line number Diff line change
@@ -16,18 +16,6 @@
</properties>

<dependencies>
<!-- ================================================================ -->
<!-- JACKSON -->
<!-- ================================================================ -->
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.databind-version}</version>
</dependency>
<!-- ================================================================ -->
<!-- SPRING -->
<!-- ================================================================ -->
6 changes: 0 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
@@ -83,13 +83,7 @@
}
</style>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway" type='text/css'>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/1.0.2/leaflet.draw.css" />
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css" />
<link rel="shortcut icon" type="image/png" href="https://cdn.jslibs.mapstore2.geo-solutions.it/leaflet/favicon.ico" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet/1.3.1/leaflet.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/leaflet.draw/1.0.2/leaflet.draw.js"></script>

</head>
<body>
<div id="container">
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -121,7 +121,10 @@
"postinstall": "node MapStore2/utility/build/postInstall.js",
"clean": "rimraf dist",
"compile": "npm run clean && mkdirp ./dist && node --max_old_space_size=2048 ./node_modules/webpack/bin/webpack.js --config prod-webpack.config.js --env.production",
"start": "webpack serve --progress --color --port 8081 --hot --inline --content-base .",
"fe:start": "webpack serve --progress --color --port 8081 --hot --inline --content-base .",
"start": "concurrently -n frontend,backend -c green,blue \"npm:fe:start\" \"npm:be:start\"",
"be:start": "npm run be:build && mvn cargo:run -f ./web/pom.xml",
"be:build": "mvn clean install",
"ext:startapp": "webpack serve --progress --color --port 8081 --hot --inline --content-base . --config build/extension/module.app.webpack.config.js",
"ext:start": "webpack serve --progress --color --port 8082 --hot --inline --config build/extension/webpack.config.js",
"ext:build": "rimraf ./dist && mkdirp ./dist && webpack --progress --color --config build/extension/prod-webpack.config.js",
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@

<modules>
<module>web</module>
<module>MapStore2/backend</module>
<module>MapStore2/java/services</module>
</modules>

</project>
Loading

0 comments on commit 72e611b

Please sign in to comment.