Merge remote-tracking branch 'origin/master' into en

PastVu · Mar 9, 2024 · e09c2cd · e09c2cd
2 parents 154da2b + 51f1feb
commit e09c2cd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 31 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -33,11 +33,11 @@ jobs:
           npm ci
           npm run build
 
-      - name: Sentry
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-        run: |
-          npm run sentry:sourcemaps
+      #- name: Sentry
+      #  env:
+      #    SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+      #  run: |
+      #    npm run sentry:sourcemaps
 
       - name: Login to ghcr.io
         uses: docker/login-action@v3

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -79,7 +79,7 @@
         "mongoose": "5.13.20",
         "ms": "2.1.2",
         "mv": "2.1.1",
-        "nodemailer": "6.6.1",
+        "nodemailer": "6.9.9",
         "postcss-less": "6.0.0",
         "pug": "3.0.2",
         "semver": "7.5.2",

diff --git a/public/js/module/map/map.js b/public/js/module/map/map.js
@@ -226,16 +226,6 @@ define([
                             attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors | <a href="http://viewfinderpanoramas.org">SRTM</a> | Map style: &copy; <a href="https://opentopomap.org">OpenTopoMap</a> (<a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a>)',
                         },
                     },
-                    {
-                        id: 'stamen_bw',
-                        desc: 'Stamen b/w',
-                        selected: ko.observable(false),
-                        options: {
-                            urlTemplate: 'https://tiles.stadiamaps.com/tiles/stamen_toner/{z}/{x}/{y}.png',
-                            attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors | Map tiles by <a href="http://stamen.com">Stamen Design</a>, <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>',
-                            maxZoom: 21,
-                        },
-                    },
                 ]),
             });
 

diff --git a/views/app.pug b/views/app.pug
@@ -20,8 +20,8 @@ html
             include ../public/js/lib/require/require.js
             include ../public/js/_mainConfig.js
             | </script>
-        else
-            script(src="https://js.sentry-cdn.com/9584509fc9bc1edf71474b8460b41d65.min.js", crossorigin="anonymous")
+        // else
+        //    script(src="https://js.sentry-cdn.com/9584509fc9bc1edf71474b8460b41d65.min.js", crossorigin="anonymous")
 
     body
         if nojsShow