Merge pull request #1480 from SCADA-LTS/prerelease/2.5.0

Prerelease/2.5.0
SCADA-LTS · Jan 15, 2021 · 49d417a · 49d417a
2 parents 5943716 + e9d32ff
commit 49d417a
Show file tree

Hide file tree

Showing 282 changed files with 20,153 additions and 49,780 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore b/.gitignore
@@ -61,6 +61,7 @@ local.properties
 /WebContent/assets/logo.png
 /WebContent/assets/evn.properties
 /WebContent/assets/commons.css
+/WebContent/WEB-INF/classes
 # Locally stored "Eclipse launch configurations"
 *.launch
 # CDT-specific
@@ -111,10 +112,5 @@ WebContent/resources/node_modules/
 WebContent/resources/package-lock.json
 build
 databases
-build.gradle
-docker-compose.yml
-Dockerfile
 gradlew
-gradlew.bat
-settings.gradle
-scadalts-ui/build.gradle
+gradlew.bat
diff --git a/.project b/.project
diff --git a/.settings/.jsdtscope b/.settings/.jsdtscope
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
diff --git a/.settings/org.eclipse.core.runtime.prefs b/.settings/org.eclipse.core.runtime.prefs
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
diff --git a/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs b/.settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs