Skip to content

Commit 1ee403f

Browse files
committed
Merged development into current
2 parents fb4a99a + ea1fff3 commit 1ee403f

270 files changed

Lines changed: 27045 additions & 11727 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ jobs:
6262
domain: ${{ vars.SURGE_DOMAIN }}
6363
project: './build'
6464
login: ${{ secrets.SURGE_LOGIN }}
65-
token: ${{ secrets.SURGE_TOKEN }}
65+
token: ${{ secrets.SURGE_TOKEN }}

.github/workflows/pull_request_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ jobs:
5555
- name: Run Unit Tests for Changed Files Only
5656
run: yarn run test:changed
5757
- name: Run Lint
58-
run: yarn run lint
58+
run: yarn run lint

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,5 @@ yarn-error.log*
3232

3333
**\ **
3434

35-
/public/tinymce/
35+
/public/tinymce/
36+
package-lock.json

.husky/pre-commit

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ if [ -f .nvmrc ]; then
77
nvm use 20 2>/dev/null || nvm install 20 && nvm use 20
88
fi
99

10-
. "$(dirname "$0")/_/husky.sh"
11-
1210
echo ""
1311
echo "🛡️ Husky pre-commit hook triggered"
1412

index.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<!DOCTYPE html>
22
<html lang="en">
33
<head>
4+
<base href="/" />
45
<meta charset="utf-8" />
56
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
67
<meta name="theme-color" content="#000000" />

package.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"html2canvas": "^1.4.1",
6666
"jest": "^30.2.0",
6767
"jquery": "^3.7.1",
68-
"jspdf": "^4.2.0",
68+
"jspdf": "^4.2.1",
6969
"jwt-decode": "^2.2.0",
7070
"leaflet": "^1.9.4",
7171
"leaflet.heat": "^0.2.0",
@@ -129,9 +129,7 @@
129129
},
130130
"resolutions": {
131131
"react": "18.3.1",
132-
"react-dom": "18.3.1",
133-
"mdn-data": "2.12.2",
134-
"ansi-escapes": "7.1.1"
132+
"react-dom": "18.3.1"
135133
},
136134
"packageManager": "yarn@1.22.22",
137135
"scripts": {

0 commit comments

Comments
 (0)