Skip to content

Commit 8fa708a

Browse files
committed
Merge branch 'develop'
2 parents a5f4d3e + e30a527 commit 8fa708a

Some content is hidden

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

54 files changed

+5929
-4422
lines changed

.editorconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
root = true
2+
3+
[*]
4+
indent_style = space
5+
indent_size = 2
6+
charset = utf-8
7+
trim_trailing_whitespace = true
8+
insert_final_newline = true
9+
end_of_line = lf
10+
# editorconfig-tools is unable to ignore longs strings or urls
11+
max_line_length = off
12+
13+
[CHANGELOG.md]
14+
indent_size = 4
15+
16+
[*.bat]
17+
end_of_line = crlf

.env.default

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
# Always ensure to load the env variables in every terminal session.
55
# Otherwise the env variables will not be available
66

7-
DOCKER_COMPOSE_APP_DEV_PORT_PUBLISHED=9001
8-
DOCKER_COMPOSE_APP_DEV_PORT_TARGET=9001
7+
DOCKER_COMPOSE_APP_PORT_PUBLISHED=9001
8+
DOCKER_COMPOSE_APP_PORT_TARGET=9001
99

1010
# IMPORTANT: When the env var DEFAULT_PAD_TEXT is unset or empty, then the pad is not established (not the landing page).
1111
# The env var DEFAULT_PAD_TEXT seems to be mandatory in the latest version of etherpad.
1212
DOCKER_COMPOSE_APP_DEV_ENV_DEFAULT_PAD_TEXT="Welcome to etherpad"
1313

14-
DOCKER_COMPOSE_APP_DEV_ADMIN_PASSWORD=
14+
DOCKER_COMPOSE_APP_ADMIN_PASSWORD=
1515

16-
DOCKER_COMPOSE_POSTGRES_DEV_ENV_POSTGRES_DATABASE=db
17-
DOCKER_COMPOSE_POSTGRES_DEV_ENV_POSTGRES_PASSWORD=etherpad-lite-password
18-
DOCKER_COMPOSE_POSTGRES_DEV_ENV_POSTGRES_USER=etherpad-lite-user
16+
DOCKER_COMPOSE_POSTGRES_DATABASE=db
17+
DOCKER_COMPOSE_POSTGRES_PASSWORD=etherpad-lite-password
18+
DOCKER_COMPOSE_POSTGRES_USER=etherpad-lite-user

.env.dev.default

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Please copy and rename this file.
2+
#
3+
# !Attention!
4+
# Always ensure to load the env variables in every terminal session.
5+
# Otherwise the env variables will not be available
6+
7+
DOCKER_COMPOSE_APP_DEV_PORT_PUBLISHED=9001
8+
DOCKER_COMPOSE_APP_DEV_PORT_TARGET=9001
9+
10+
# IMPORTANT: When the env var DEFAULT_PAD_TEXT is unset or empty, then the pad is not established (not the landing page).
11+
# The env var DEFAULT_PAD_TEXT seems to be mandatory in the latest version of etherpad.
12+
DOCKER_COMPOSE_APP_DEV_ENV_DEFAULT_PAD_TEXT="Welcome to etherpad"
13+
14+
DOCKER_COMPOSE_APP_DEV_ADMIN_PASSWORD=
15+
16+
DOCKER_COMPOSE_POSTGRES_DEV_ENV_POSTGRES_DATABASE=db
17+
DOCKER_COMPOSE_POSTGRES_DEV_ENV_POSTGRES_PASSWORD=etherpad-lite-password
18+
DOCKER_COMPOSE_POSTGRES_DEV_ENV_POSTGRES_USER=etherpad-lite-user

.github/workflows/backend-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- uses: pnpm/action-setup@v3
3737
name: Install pnpm
3838
with:
39-
version: 8
39+
version: 9.0.4
4040
run_install: false
4141
- name: Get pnpm store directory
4242
shell: bash
@@ -93,7 +93,7 @@ jobs:
9393
- uses: pnpm/action-setup@v3
9494
name: Install pnpm
9595
with:
96-
version: 8
96+
version: 9.0.4
9797
run_install: false
9898
- name: Get pnpm store directory
9999
shell: bash
@@ -163,7 +163,7 @@ jobs:
163163
- uses: pnpm/action-setup@v3
164164
name: Install pnpm
165165
with:
166-
version: 8
166+
version: 9.0.4
167167
run_install: false
168168
- name: Get pnpm store directory
169169
shell: bash
@@ -216,7 +216,7 @@ jobs:
216216
- uses: pnpm/action-setup@v3
217217
name: Install pnpm
218218
with:
219-
version: 8
219+
version: 9.0.4
220220
run_install: false
221221
- name: Get pnpm store directory
222222
shell: bash

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- uses: pnpm/action-setup@v3
3939
name: Install pnpm
4040
with:
41-
version: 8
41+
version: 9.0.4
4242
run_install: false
4343
- name: Get pnpm store directory
4444
shell: bash

.github/workflows/docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- uses: pnpm/action-setup@v3
4848
name: Install pnpm
4949
with:
50-
version: 8
50+
version: 9.0.4
5151
run_install: false
5252
- name: Get pnpm store directory
5353
shell: bash

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
- uses: pnpm/action-setup@v3
3838
name: Install pnpm
3939
with:
40-
version: 8
40+
version: 9.0.4
4141
run_install: false
4242
- name: Get pnpm store directory
4343
shell: bash

.github/workflows/frontend-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
- uses: pnpm/action-setup@v3
3131
name: Install pnpm
3232
with:
33-
version: 8
33+
version: 9.0.4
3434
run_install: false
3535
- name: Get pnpm store directory
3636
shell: bash
@@ -96,7 +96,7 @@ jobs:
9696
- uses: pnpm/action-setup@v3
9797
name: Install pnpm
9898
with:
99-
version: 8
99+
version: 9.0.4
100100
run_install: false
101101
- name: Get pnpm store directory
102102
shell: bash
@@ -163,7 +163,7 @@ jobs:
163163
- uses: pnpm/action-setup@v3
164164
name: Install pnpm
165165
with:
166-
version: 8
166+
version: 9.0.4
167167
run_install: false
168168
- name: Get pnpm store directory
169169
shell: bash

.github/workflows/load-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- uses: pnpm/action-setup@v3
3333
name: Install pnpm
3434
with:
35-
version: 8
35+
version: 9.0.4
3636
run_install: false
3737
- name: Get pnpm store directory
3838
shell: bash
@@ -76,7 +76,7 @@ jobs:
7676
- uses: pnpm/action-setup@v3
7777
name: Install pnpm
7878
with:
79-
version: 8
79+
version: 9.0.4
8080
run_install: false
8181
- name: Get pnpm store directory
8282
shell: bash
@@ -147,7 +147,7 @@ jobs:
147147
- uses: pnpm/action-setup@v3
148148
name: Install pnpm
149149
with:
150-
version: 8
150+
version: 9.0.4
151151
run_install: false
152152
- name: Get pnpm store directory
153153
shell: bash

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: pnpm/action-setup@v3
3030
name: Install pnpm
3131
with:
32-
version: 8
32+
version: 9.0.4
3333
run_install: false
3434
- name: Get pnpm store directory
3535
shell: bash

0 commit comments

Comments
 (0)