Skip to content

Commit 829982a

Browse files
TomNewChaoTomNewChao
authored
Merge branch 'ether:develop' into develop
2 parents d986347 + 8569082 commit 829982a

Some content is hidden

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

71 files changed

+16510
-15569
lines changed

‎.github/workflows/backend-tests.yml

+7-9
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
node: [18, 20, 21]
27+
node: [18, 20, 22]
2828
steps:
2929
-
3030
name: Checkout repository
@@ -33,7 +33,7 @@ jobs:
3333
uses: actions/setup-node@v4
3434
with:
3535
node-version: ${{ matrix.node }}
36-
- uses: pnpm/action-setup@v3
36+
- uses: pnpm/action-setup@v4
3737
name: Install pnpm
3838
with:
3939
version: 9.0.4
@@ -81,7 +81,7 @@ jobs:
8181
strategy:
8282
fail-fast: false
8383
matrix:
84-
node: [18, 20, 21]
84+
node: [18, 20, 22]
8585
steps:
8686
-
8787
name: Checkout repository
@@ -90,7 +90,7 @@ jobs:
9090
uses: actions/setup-node@v4
9191
with:
9292
node-version: ${{ matrix.node }}
93-
- uses: pnpm/action-setup@v3
93+
- uses: pnpm/action-setup@v4
9494
name: Install pnpm
9595
with:
9696
version: 9.0.4
@@ -133,7 +133,6 @@ jobs:
133133
ep_font_size
134134
ep_hash_auth
135135
ep_headings2
136-
ep_image_upload
137136
ep_markdown
138137
ep_readonly_guest
139138
ep_set_title_on_pad
@@ -160,7 +159,7 @@ jobs:
160159
uses: actions/setup-node@v4
161160
with:
162161
node-version: 20
163-
- uses: pnpm/action-setup@v3
162+
- uses: pnpm/action-setup@v4
164163
name: Install pnpm
165164
with:
166165
version: 9.0.4
@@ -212,8 +211,8 @@ jobs:
212211
-
213212
uses: actions/setup-node@v4
214213
with:
215-
node-version: 21
216-
- uses: pnpm/action-setup@v3
214+
node-version: 22
215+
- uses: pnpm/action-setup@v4
217216
name: Install pnpm
218217
with:
219218
version: 9.0.4
@@ -249,7 +248,6 @@ jobs:
249248
ep_font_size
250249
ep_hash_auth
251250
ep_headings2
252-
ep_image_upload
253251
ep_markdown
254252
ep_readonly_guest
255253
ep_set_title_on_pad

‎.github/workflows/build-and-deploy-docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/checkout@v4
3636
- name: Setup Pages
3737
uses: actions/configure-pages@v5
38-
- uses: pnpm/action-setup@v3
38+
- uses: pnpm/action-setup@v4
3939
name: Install pnpm
4040
with:
4141
version: 9.0.4

‎.github/workflows/docker.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
uses: docker/setup-buildx-action@v3
3232
-
3333
name: Build and export to Docker
34-
uses: docker/build-push-action@v5
34+
uses: docker/build-push-action@v6
3535
with:
3636
context: .
3737
target: production
@@ -44,7 +44,7 @@ jobs:
4444
uses: actions/setup-node@v4
4545
with:
4646
node-version: 'lts/*'
47-
- uses: pnpm/action-setup@v3
47+
- uses: pnpm/action-setup@v4
4848
name: Install pnpm
4949
with:
5050
version: 9.0.4
@@ -99,7 +99,7 @@ jobs:
9999
-
100100
name: Build and push
101101
if: github.event_name == 'push'
102-
uses: docker/build-push-action@v5
102+
uses: docker/build-push-action@v6
103103
with:
104104
context: .
105105
target: production

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ permissions:
1111

1212
jobs:
1313
withplugins:
14-
if: ${{ github.actor != 'dependabot[bot]' }}
1514
name: with plugins
1615
runs-on: ubuntu-latest
1716

1817
strategy:
1918
fail-fast: false
2019
matrix:
21-
node: [20, 21]
20+
node: [20, 22]
2221

2322
steps:
2423
-
@@ -34,7 +33,7 @@ jobs:
3433
uses: actions/setup-node@v4
3534
with:
3635
node-version: ${{ matrix.node }}
37-
- uses: pnpm/action-setup@v3
36+
- uses: pnpm/action-setup@v4
3837
name: Install pnpm
3938
with:
4039
version: 9.0.4
@@ -85,7 +84,7 @@ jobs:
8584
run: "sed -i 's/\"enableAdminUITests\": false/\"enableAdminUITests\": true,\\n\"users\":{\"admin\":{\"password\":\"changeme1\",\"is_admin\":true}}/' settings.json"
8685
-
8786
name: increase maxHttpBufferSize
88-
run: "sed -i 's/\"maxHttpBufferSize\": 10000/\"maxHttpBufferSize\": 10000000/' settings.json"
87+
run: "sed -i 's/\"maxHttpBufferSize\": 50000/\"maxHttpBufferSize\": 10000000/' settings.json"
8988
-
9089
name: Disable import/export rate limiting
9190
run: |

‎.github/workflows/frontend-tests.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
-
2727
uses: actions/setup-node@v4
2828
with:
29-
node-version: 21
30-
- uses: pnpm/action-setup@v3
29+
node-version: 22
30+
- uses: pnpm/action-setup@v4
3131
name: Install pnpm
3232
with:
3333
version: 9.0.4
@@ -92,8 +92,8 @@ jobs:
9292
uses: actions/checkout@v4
9393
- uses: actions/setup-node@v4
9494
with:
95-
node-version: 21
96-
- uses: pnpm/action-setup@v3
95+
node-version: 22
96+
- uses: pnpm/action-setup@v4
9797
name: Install pnpm
9898
with:
9999
version: 9.0.4
@@ -159,8 +159,8 @@ jobs:
159159
-
160160
uses: actions/setup-node@v4
161161
with:
162-
node-version: 21
163-
- uses: pnpm/action-setup@v3
162+
node-version: 22
163+
- uses: pnpm/action-setup@v4
164164
name: Install pnpm
165165
with:
166166
version: 9.0.4

‎.github/workflows/load-test.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/setup-node@v4
3030
with:
3131
node-version: 20
32-
- uses: pnpm/action-setup@v3
32+
- uses: pnpm/action-setup@v4
3333
name: Install pnpm
3434
with:
3535
version: 9.0.4
@@ -73,7 +73,7 @@ jobs:
7373
uses: actions/setup-node@v4
7474
with:
7575
node-version: 20
76-
- uses: pnpm/action-setup@v3
76+
- uses: pnpm/action-setup@v4
7777
name: Install pnpm
7878
with:
7979
version: 9.0.4
@@ -144,7 +144,7 @@ jobs:
144144
uses: actions/setup-node@v4
145145
with:
146146
node-version: 20
147-
- uses: pnpm/action-setup@v3
147+
- uses: pnpm/action-setup@v4
148148
name: Install pnpm
149149
with:
150150
version: 9.0.4

‎.github/workflows/perform-type-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
- uses: actions/setup-node@v4
2727
with:
2828
node-version: 20
29-
- uses: pnpm/action-setup@v3
29+
- uses: pnpm/action-setup@v4
3030
name: Install pnpm
3131
with:
3232
version: 9.0.4

‎.github/workflows/rate-limit.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: actions/setup-node@v4
3030
with:
3131
node-version: 20
32-
- uses: pnpm/action-setup@v3
32+
- uses: pnpm/action-setup@v4
3333
name: Install pnpm
3434
with:
3535
version: 9.0.4
@@ -48,7 +48,7 @@ jobs:
4848
4949
-
5050
name: docker network
51-
run: docker network create --subnet=172.23.42.0/16 ep_net
51+
run: docker network create --subnet=172.23.0.0/16 ep_net
5252
-
5353
name: build docker image
5454
run: |

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -24,18 +24,18 @@ jobs:
2424
strategy:
2525
fail-fast: false
2626
matrix:
27-
node: [18, 20, 21]
27+
node: [18, 20, 22]
2828
steps:
2929
-
3030
name: Check out latest release
3131
uses: actions/checkout@v4
3232
with:
33-
ref: master
33+
ref: develop #FIXME change to master when doing release
3434
-
3535
uses: actions/setup-node@v4
3636
with:
3737
node-version: ${{ matrix.node }}
38-
- uses: pnpm/action-setup@v3
38+
- uses: pnpm/action-setup@v4
3939
name: Install pnpm
4040
with:
4141
version: 9.0.4
@@ -85,7 +85,6 @@ jobs:
8585
ep_font_size
8686
ep_hash_auth
8787
ep_headings2
88-
ep_image_upload
8988
ep_markdown
9089
ep_readonly_guest
9190
ep_set_title_on_pad

‎.github/workflows/windows.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ jobs:
3434
-
3535
uses: actions/setup-node@v4
3636
with:
37-
node-version: 21
38-
- uses: pnpm/action-setup@v3
37+
node-version: 22
38+
- uses: pnpm/action-setup@v4
3939
name: Install pnpm
4040
with:
4141
version: 9.0.4
@@ -129,7 +129,7 @@ jobs:
129129
uses: actions/setup-node@v4
130130
with:
131131
node-version: 20
132-
- uses: pnpm/action-setup@v3
132+
- uses: pnpm/action-setup@v4
133133
name: Install pnpm
134134
with:
135135
version: 9.0.4

‎CHANGELOG.md

+25-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
# 2.1.1
2+
3+
4+
### Notable enhancements and fixes
5+
6+
- Fixed failing Docker build when checked out as git submodule. Thanks to @neurolabs
7+
- Fixed: Fallback to websocket and polling when unknown(old) config is present for socket io
8+
- Fixed: Next page disabled if zero page by @samyakj023
9+
- On CTRL+CLICK bring the window back to focus by Helder Sepulveda
10+
11+
# 2.1.0
12+
13+
### Notable enhancements and fixes
14+
15+
- Added PWA support. You can now add your Etherpad instance to your home screen on your mobile device or desktop.
16+
- Fixed live plugin manager versions clashing. Thanks to @yacchin1205
17+
- Fixed a bug in the pad panel where pagination was not working correctly when sorting by pad name
18+
19+
### Compatibility changes
20+
21+
- Reintroduced APIKey.txt support. You can now switch between APIKey and OAuth2.0 authentication. This can be toggled with the setting authenticationMethod. The default is OAuth2. If you want to use the APIKey method you can set that to `apikey`.
22+
23+
124
# 2.0.3
225

326
### Notable enhancements and fixes
@@ -47,8 +70,8 @@
4770
- Bin folder: The bin folder has been moved from the src folder to the root folder. This change was necessary as the contained scripts do not represent core functionality of the user.
4871
- Starting Etherpad: Etherpad can now be started with a single command: `pnpm run prod` in the root directory.
4972
- Installing Etherpad: Etherpad no longer symlinks itself in the root directory. This is now also taken care by pnpm, and it just creates a node_modules folder with the src directory`s ep_etherpad-lite folder
50-
- Plugins can now be installed simply via the command: `pnpm run install-plugins first-plugin second-plugin` or if you want to install from path you can do:
51-
`pnpm run install-plugins --path ../path-to-plugin`
73+
- Plugins can now be installed simply via the command: `pnpm run plugins i first-plugin second-plugin` or if you want to install from path you can do:
74+
`pnpm run plugins i --path ../path-to-plugin`
5275

5376

5477
# 1.9.7

‎Dockerfile

+12-12
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
#
55
# Author: muxator
66

7-
FROM node:alpine as adminBuild
7+
FROM node:alpine AS adminbuild
88

99
WORKDIR /opt/etherpad-lite
1010
COPY ./ ./
1111
RUN cd ./admin && npm install -g [email protected] && pnpm install && pnpm run build --outDir ./dist
1212
RUN cd ./ui && pnpm install && pnpm run build --outDir ./dist
1313

1414

15-
FROM node:alpine as build
15+
FROM node:alpine AS build
1616
LABEL maintainer="Etherpad team, https://github.com/ether/etherpad-lite"
1717

1818
# Set these arguments when building the image from behind a proxy
@@ -105,37 +105,37 @@ USER etherpad
105105
WORKDIR "${EP_DIR}"
106106

107107
# etherpads version feature requires this. Only copy what is really needed
108-
COPY --chown=etherpad:etherpad ./.git/HEAD ./.git/HEAD
109-
COPY --chown=etherpad:etherpad ./.git/refs ./.git/refs
108+
COPY --chown=etherpad:etherpad ./.git/HEA[D] ./.git/HEAD
109+
COPY --chown=etherpad:etherpad ./.git/ref[s] ./.git/refs
110110
COPY --chown=etherpad:etherpad ${SETTINGS} ./settings.json
111111
COPY --chown=etherpad:etherpad ./var ./var
112112
COPY --chown=etherpad:etherpad ./bin ./bin
113113
COPY --chown=etherpad:etherpad ./pnpm-workspace.yaml ./package.json ./
114114

115-
FROM build as development
115+
FROM build AS development
116116

117117
COPY --chown=etherpad:etherpad ./src/package.json .npmrc ./src/
118-
COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/admin/dist ./src/templates/admin
119-
COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/ui/dist ./src/static/oidc
118+
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/admin/dist ./src/templates/admin
119+
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/ui/dist ./src/static/oidc
120120

121121
RUN bin/installDeps.sh && \
122122
if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \
123-
pnpm run install-plugins ${ETHERPAD_PLUGINS} ${ETHERPAD_LOCAL_PLUGINS:+--path ${ETHERPAD_LOCAL_PLUGINS}}; \
123+
pnpm run plugins i ${ETHERPAD_PLUGINS} ${ETHERPAD_LOCAL_PLUGINS:+--path ${ETHERPAD_LOCAL_PLUGINS}}; \
124124
fi
125125

126126

127-
FROM build as production
127+
FROM build AS production
128128

129129
ENV NODE_ENV=production
130130
ENV ETHERPAD_PRODUCTION=true
131131

132132
COPY --chown=etherpad:etherpad ./src ./src
133-
COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/admin/dist ./src/templates/admin
134-
COPY --chown=etherpad:etherpad --from=adminBuild /opt/etherpad-lite/ui/dist ./src/static/oidc
133+
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/admin/dist ./src/templates/admin
134+
COPY --chown=etherpad:etherpad --from=adminbuild /opt/etherpad-lite/ui/dist ./src/static/oidc
135135

136136
RUN bin/installDeps.sh && rm -rf ~/.npm && rm -rf ~/.local && rm -rf ~/.cache && \
137137
if [ ! -z "${ETHERPAD_PLUGINS}" ] || [ ! -z "${ETHERPAD_LOCAL_PLUGINS}" ]; then \
138-
pnpm run install-plugins ${ETHERPAD_PLUGINS} ${ETHERPAD_LOCAL_PLUGINS:+--path ${ETHERPAD_LOCAL_PLUGINS}}; \
138+
pnpm run plugins i ${ETHERPAD_PLUGINS} ${ETHERPAD_LOCAL_PLUGINS:+--path ${ETHERPAD_LOCAL_PLUGINS}}; \
139139
fi
140140

141141

0 commit comments

Comments
 (0)