Merge branch 'dev' into deps/coreui-coreui-5.x

deNBI · Aug 14, 2024 · 822fd33 · 822fd33
2 parents addc6f2 + 7bddcb8
commit 822fd33
Show file tree

Hide file tree

Showing 155 changed files with 25,848 additions and 40,758 deletions.
diff --git a/.github/workflows/LintingAutoFix.yml b/.github/workflows/LintingAutoFix.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Create Pull Request
         if: steps.git-check.outputs.modified == 'true'
         id: cpr
-        uses: peter-evans/[email protected].2
+        uses: peter-evans/[email protected].5
         with:
            token: ${{ secrets.GITHUB_TOKEN }}
            commit-message: fix(Linting):blacked code

diff --git a/.github/workflows/master-protection.yml b/.github/workflows/master-protection.yml
@@ -14,7 +14,7 @@ jobs:
         uses: rokroskar/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/[email protected].1
+      - uses: actions/[email protected].6
 
       - name: Check Tag
         run: |

diff --git a/.gitignore b/.gitignore
@@ -34,7 +34,7 @@
 npm-debug.log
 testem.log
 /typings
-
+/.nx
 #test environment
 /tests/environment.json
 *e2e/environment.json

diff --git a/.nodeenvrc b/.nodeenvrc
@@ -1,3 +1,3 @@
 [nodeenv]
-node = 18.18.2
+node = 18.20.3
 
diff --git a/.nx/cache/18.3.5-nx.linux-x64-gnu.node b/.nx/cache/18.3.5-nx.linux-x64-gnu.node
diff --git a/.nx/cache/nx_files.nxt b/.nx/cache/nx_files.nxt
diff --git a/Dockerfile b/Dockerfile
@@ -20,7 +20,7 @@ COPY . .
 RUN $(npm bin)/ng build --configuration=custom   --build-optimizer
 
 ### STAGE 2: Setup ###
-FROM nginx:1.25.4-alpine
+FROM nginx:1.26.1-alpine
 
 ## Copy our default nginx config
 COPY nginx/default.conf /etc/nginx/conf.d/

diff --git a/angular.json b/angular.json
@@ -33,7 +33,6 @@
               ]
             },
             "scripts": [
-              "src/assets/js/matomo.js"
             ],
             "vendorChunk": true,
             "extractLicenses": false,