Skip to content

Commit 016f43e

Browse files
SamTV12345SamTV12345
committed
Merge branch 'develop'
2 parents 293bd64 + c95799e commit 016f43e

48 files changed

Lines changed: 1042 additions & 1878 deletions

Some content is hidden

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

‎.github/workflows/backend-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: Checkout repository
2525
uses: actions/checkout@v4
2626
-
27-
uses: actions/setup-node@v3
27+
uses: actions/setup-node@v4
2828
with:
2929
node-version: ${{ matrix.node }}
3030
cache: 'npm'
@@ -61,7 +61,7 @@ jobs:
6161
name: Checkout repository
6262
uses: actions/checkout@v4
6363
-
64-
uses: actions/setup-node@v3
64+
uses: actions/setup-node@v4
6565
with:
6666
node-version: ${{ matrix.node }}
6767
cache: 'npm'
@@ -122,7 +122,7 @@ jobs:
122122
name: Checkout repository
123123
uses: actions/checkout@v4
124124
-
125-
uses: actions/setup-node@v3
125+
uses: actions/setup-node@v4
126126
with:
127127
node-version: 20
128128
cache: 'npm'
@@ -155,7 +155,7 @@ jobs:
155155
name: Checkout repository
156156
uses: actions/checkout@v4
157157
-
158-
uses: actions/setup-node@v3
158+
uses: actions/setup-node@v4
159159
with:
160160
node-version: 20
161161
cache: 'npm'

‎.github/workflows/docker.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
cache-to: type=gha,mode=max
3737
-
3838
name: Set up Node.js
39-
uses: actions/setup-node@v3
39+
uses: actions/setup-node@v4
4040
with:
4141
node-version: 'lts/*'
4242
cache: 'npm'

‎.github/workflows/frontend-admin-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
name: Checkout repository
3030
uses: actions/checkout@v4
3131
-
32-
uses: actions/setup-node@v3
32+
uses: actions/setup-node@v4
3333
with:
3434
node-version: ${{ matrix.node }}
3535
cache: 'npm'
@@ -78,7 +78,7 @@ jobs:
7878
name: Remove standard frontend test files, so only admin tests are run
7979
run: mv src/tests/frontend/specs/* /tmp && mv /tmp/admin*.js src/tests/frontend/specs
8080
-
81-
uses: saucelabs/sauce-connect-action@v2.3.4
81+
uses: saucelabs/sauce-connect-action@v2.3.5
8282
with:
8383
username: ${{ secrets.SAUCE_USERNAME }}
8484
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

‎.github/workflows/frontend-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
name: Checkout repository
2424
uses: actions/checkout@v4
2525
-
26-
uses: actions/setup-node@v3
26+
uses: actions/setup-node@v4
2727
with:
2828
node-version: 20
2929
cache: 'npm'
@@ -45,7 +45,7 @@ jobs:
4545
run: |
4646
sed -e '/^ *"importExportRateLimiting":/,/^ *\}/ s/"max":.*/"max": 100000000/' -i settings.json
4747
-
48-
uses: saucelabs/sauce-connect-action@v2.3.4
48+
uses: saucelabs/sauce-connect-action@v2.3.5
4949
with:
5050
username: ${{ secrets.SAUCE_USERNAME }}
5151
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
@@ -78,7 +78,7 @@ jobs:
7878
name: Checkout repository
7979
uses: actions/checkout@v4
8080
-
81-
uses: actions/setup-node@v3
81+
uses: actions/setup-node@v4
8282
with:
8383
node-version: 20
8484
cache: 'npm'
@@ -133,7 +133,7 @@ jobs:
133133
name: Remove standard frontend test files, so only plugin tests are run
134134
run: rm src/tests/frontend/specs/*
135135
-
136-
uses: saucelabs/sauce-connect-action@v2.3.4
136+
uses: saucelabs/sauce-connect-action@v2.3.5
137137
with:
138138
username: ${{ secrets.SAUCE_USERNAME }}
139139
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}

‎.github/workflows/lint-package-lock.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Checkout repository
2121
uses: actions/checkout@v4
2222
-
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: 20
2626
cache: 'npm'
@@ -29,7 +29,7 @@ jobs:
2929
src/bin/doc/package-lock.json
3030
-
3131
name: Install lockfile-lint
32-
run: npm install --no-save lockfile-lint
32+
run: npm install --no-save lockfile-lint --legacy-peer-deps
3333
-
3434
name: Run lockfile-lint on package-lock.json
3535
run: >

‎.github/workflows/load-test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Checkout repository
2121
uses: actions/checkout@v4
2222
-
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: 20
2626
cache: 'npm'
@@ -50,7 +50,7 @@ jobs:
5050
name: Checkout repository
5151
uses: actions/checkout@v4
5252
-
53-
uses: actions/setup-node@v3
53+
uses: actions/setup-node@v4
5454
with:
5555
node-version: 20
5656
cache: 'npm'
@@ -107,7 +107,7 @@ jobs:
107107
name: Checkout repository
108108
uses: actions/checkout@v4
109109
-
110-
uses: actions/setup-node@v3
110+
uses: actions/setup-node@v4
111111
with:
112112
node-version: 20
113113
cache: 'npm'

‎.github/workflows/rate-limit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: Checkout repository
2121
uses: actions/checkout@v4
2222
-
23-
uses: actions/setup-node@v3
23+
uses: actions/setup-node@v4
2424
with:
2525
node-version: 20
2626
cache: 'npm'

‎.github/workflows/upgrade-from-latest-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
with:
2727
ref: master
2828
-
29-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: ${{ matrix.node }}
3232
cache: 'npm'
@@ -90,7 +90,7 @@ jobs:
9090
run: cd src && npm test
9191
-
9292
name: Install Cypress
93-
run: cd src && npm install cypress
93+
run: cd src && npm install cypress --legacy-peer-deps
9494
-
9595
name: Run Etherpad & Test Frontend
9696
run: |

‎.github/workflows/windows.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
name: Checkout repository
2727
uses: actions/checkout@v4
2828
-
29-
uses: actions/setup-node@v3
29+
uses: actions/setup-node@v4
3030
with:
3131
node-version: 20
3232
cache: 'npm'
@@ -106,7 +106,7 @@ jobs:
106106
name: Extract Etherpad
107107
run: 7z x etherpad-win.zip -oetherpad
108108
-
109-
uses: actions/setup-node@v3
109+
uses: actions/setup-node@v4
110110
with:
111111
node-version: 20
112112
cache: 'npm'
@@ -115,7 +115,7 @@ jobs:
115115
etherpad/src/bin/doc/package-lock.json
116116
-
117117
name: Install Cypress
118-
run: cd etherpad && cd src && npm install cypress
118+
run: cd etherpad && cd src && npm install cypress --legacy-peer-deps
119119
-
120120
name: Run Etherpad
121121
run: |
@@ -130,6 +130,6 @@ jobs:
130130
run: mv etherpad-win.zip etherpad-lite-win.zip
131131
- name: upload binaries to release
132132
uses: softprops/action-gh-release@v1
133-
if: ${{startsWith(github.ref, 'refs/tags/') }}
133+
if: ${{startsWith(github.ref, 'refs/tags/v') }}
134134
with:
135135
files: etherpad-lite-win.zip

‎CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
# 1.9.4
2+
3+
### Compability changes
4+
5+
* Log4js has been updated to the latest version. As it involved a bump of 6 major version.
6+
A lot has changed since then. Most notably the console appender has been deprecated. You can find out more about it [here](https://github.com/log4js-node/log4js-node)
7+
8+
### Notable enhancements and fixes
9+
10+
* Fix for MySQL: The logger calls were incorrectly configured leading to a crash when e.g. somebody uses a different encoding than standard MySQL encoding.
11+
112
# 1.9.3
213

314
### Compability changes

0 commit comments

Comments
 (0)