Skip to content

Commit f11cf9e

Browse files
authored
Merge branch 'main' into move_email_to_celery
2 parents 4465a4d + 0892c05 commit f11cf9e

File tree

140 files changed

+4573
-4846
lines changed

Some content is hidden

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

140 files changed

+4573
-4846
lines changed

CHANGELOG.md

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,32 @@ and this project adheres to
88

99
## [Unreleased]
1010

11+
### Changed
12+
13+
- ⚡️(frontend) improve accessibility:
14+
- #1248
15+
- #1235
16+
- #1275
17+
- #1255
18+
- #1262
19+
- #1244
20+
- #1270
21+
- #1282
22+
23+
### Fixed
24+
25+
- 🐛(makefile) Windows compatibility fix for Docker volume mounting #1264
26+
- 🐛(minio) fix user permission error with Minio and Windows #1264
27+
28+
## [3.5.0] - 2025-07-31
29+
1130
### Added
1231

13-
- ✨(helm) Service Account support for K8s Resources in Helm Charts #778
14-
- ✨(backend) allow masking documents from the list view #1171
32+
- ✨(helm) Service Account support for K8s Resources in Helm Charts #780
33+
- ✨(backend) allow masking documents from the list view #1172
1534
- ✨(frontend) subdocs can manage link reach #1190
1635
- ✨(frontend) add duplicate action to doc tree #1175
36+
- ✨(frontend) Interlinking doc #904
1737
- ✨(frontend) add multi columns support for editor #1219
1838

1939
### Changed
@@ -23,6 +43,7 @@ and this project adheres to
2343
- 🔧(project) change env.d system by using local files #1200
2444
- ⚡️(frontend) improve tree stability #1207
2545
- ⚡️(frontend) improve accessibility #1232
46+
- 🛂(frontend) block drag n drop when not desktop #1239
2647
- ⚡(backend) move email sending to celery
2748

2849
### Fixed
@@ -31,6 +52,7 @@ and this project adheres to
3152
- 🐛(frontend) fix empty left panel after deleting root doc #1197
3253
- 🐛(helm) charts generate invalid YAML for collaboration API / WS #890
3354
- 🐛(frontend) 401 redirection overridden #1214
55+
- 🐛(frontend) include root parent in search #1243
3456

3557
## [3.4.2] - 2025-07-18
3658

@@ -674,7 +696,8 @@ and this project adheres to
674696
- ✨(frontend) Coming Soon page (#67)
675697
- 🚀 Impress, project to manage your documents easily and collaboratively.
676698

677-
[unreleased]: https://github.com/suitenumerique/docs/compare/v3.4.2...main
699+
[unreleased]: https://github.com/suitenumerique/docs/compare/v3.5.0...main
700+
[v3.5.0]: https://github.com/suitenumerique/docs/releases/v3.5.0
678701
[v3.4.2]: https://github.com/suitenumerique/docs/releases/v3.4.2
679702
[v3.4.1]: https://github.com/suitenumerique/docs/releases/v3.4.1
680703
[v3.4.0]: https://github.com/suitenumerique/docs/releases/v3.4.0

Makefile

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,13 @@ DB_PORT = 5432
3535

3636
# -- Docker
3737
# Get the current user ID to use for docker run and docker exec commands
38-
DOCKER_UID = $(shell id -u)
39-
DOCKER_GID = $(shell id -g)
40-
DOCKER_USER = $(DOCKER_UID):$(DOCKER_GID)
38+
ifeq ($(OS),Windows_NT)
39+
DOCKER_USER := 0:0 # run containers as root on Windows
40+
else
41+
DOCKER_UID := $(shell id -u)
42+
DOCKER_GID := $(shell id -g)
43+
DOCKER_USER := $(DOCKER_UID):$(DOCKER_GID)
44+
endif
4145
COMPOSE = DOCKER_USER=$(DOCKER_USER) docker compose
4246
COMPOSE_E2E = DOCKER_USER=$(DOCKER_USER) docker compose -f compose.yml -f compose-e2e.yml
4347
COMPOSE_EXEC = $(COMPOSE) exec
@@ -48,7 +52,7 @@ COMPOSE_RUN_CROWDIN = $(COMPOSE_RUN) crowdin crowdin
4852

4953
# -- Backend
5054
MANAGE = $(COMPOSE_RUN_APP) python manage.py
51-
MAIL_YARN = $(COMPOSE_RUN) -w /app/src/mail node yarn
55+
MAIL_YARN = $(COMPOSE_RUN) -w //app/src/mail node yarn
5256

5357
# -- Frontend
5458
PATH_FRONT = ./src/frontend

bin/_config.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ function _set_user() {
3838
# options: docker compose command options
3939
# ARGS : docker compose command arguments
4040
function _docker_compose() {
41+
# Set DOCKER_USER for Windows compatibility with MinIO
42+
if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" || -n "${WSL_DISTRO_NAME:-}" ]]; then
43+
export DOCKER_USER="0:0"
44+
fi
4145

4246
echo "🐳(compose) file: '${COMPOSE_FILE}'"
4347
docker compose \

docker/files/production/etc/nginx/conf.d/default.conf.template

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ server {
1111
server_name localhost;
1212
charset utf-8;
1313

14+
# increase max upload size
15+
client_max_body_size 10m;
16+
1417
# Disables server version feedback on pages and in headers
1518
server_tokens off;
1619

@@ -68,7 +71,7 @@ server {
6871
proxy_set_header Host $host;
6972
}
7073

71-
location /collaboration/api/ {
74+
location /collaboration/api/ {
7275
# Collaboration server
7376
proxy_pass http://${YPROVIDER_HOST}:4444;
7477
proxy_set_header Host $host;
@@ -95,7 +98,7 @@ server {
9598

9699
add_header Content-Security-Policy "default-src 'none'" always;
97100
}
98-
101+
99102
location /media-auth {
100103
proxy_pass http://docs_backend/api/v1.0/documents/media-auth/;
101104
proxy_set_header X-Forwarded-Proto https;
@@ -109,4 +112,4 @@ server {
109112
proxy_set_header Content-Length "";
110113
proxy_set_header X-Original-Method $request_method;
111114
}
112-
}
115+
}

docs/examples/compose/compose.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ services:
77
timeout: 2s
88
retries: 300
99
env_file:
10-
- env.d/postgresql
11-
- env.d/common
10+
- env.d/postgresql
11+
- env.d/common
1212
environment:
13-
- PGDATA=/var/lib/postgresql/data/pgdata
13+
- PGDATA=/var/lib/postgresql/data/pgdata
1414
volumes:
15-
- ./data/databases/backend:/var/lib/postgresql/data/pgdata
15+
- ./data/databases/backend:/var/lib/postgresql/data/pgdata
1616

1717
redis:
1818
image: redis:8
@@ -22,12 +22,12 @@ services:
2222
user: ${DOCKER_USER:-1000}
2323
restart: always
2424
environment:
25-
- DJANGO_CONFIGURATION=Production
25+
- DJANGO_CONFIGURATION=Production
2626
env_file:
27-
- env.d/common
28-
- env.d/backend
29-
- env.d/yprovider
30-
- env.d/postgresql
27+
- env.d/common
28+
- env.d/backend
29+
- env.d/yprovider
30+
- env.d/postgresql
3131
healthcheck:
3232
test: ["CMD", "python", "manage.py", "check"]
3333
interval: 15s
@@ -45,24 +45,24 @@ services:
4545
image: lasuite/impress-y-provider:latest
4646
user: ${DOCKER_USER:-1000}
4747
env_file:
48-
- env.d/common
49-
- env.d/yprovider
48+
- env.d/common
49+
- env.d/yprovider
5050

5151
frontend:
5252
image: lasuite/impress-frontend:latest
5353
user: "101"
5454
entrypoint:
55-
- /docker-entrypoint.sh
55+
- /docker-entrypoint.sh
5656
command: ["nginx", "-g", "daemon off;"]
5757
env_file:
58-
- env.d/common
58+
- env.d/common
5959
# Uncomment and set your values if using our nginx proxy example
6060
#environment:
61-
# - VIRTUAL_HOST=${DOCS_HOST} # used by nginx proxy
61+
# - VIRTUAL_HOST=${DOCS_HOST} # used by nginx proxy
6262
# - VIRTUAL_PORT=8083 # used by nginx proxy
6363
# - LETSENCRYPT_HOST=${DOCS_HOST} # used by lets encrypt to generate TLS certificate
6464
volumes:
65-
- ./default.conf.template:/etc/nginx/templates/docs.conf.template
65+
- ./default.conf.template:/etc/nginx/templates/docs.conf.template
6666
depends_on:
6767
backend:
6868
condition: service_healthy

docs/examples/compose/keycloak/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
```bash
1111
mkdir keycloak
12-
curl -o compose.yaml https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/docs/examples/compose/keycloak/compose.yaml
13-
curl -o env.d/kc_postgresql https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/env.d/production.dist/kc_postgresql
14-
curl -o env.d/keycloak https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/env.d/production.dist/keycloak
12+
curl -o keycloak/compose.yaml https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/docs/examples/compose/keycloak/compose.yaml
13+
curl -o keycloak/env.d/kc_postgresql https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/env.d/production.dist/kc_postgresql
14+
curl -o keycloak/env.d/keycloak https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/env.d/production.dist/keycloak
1515
```
1616

1717
### Step 2:. Update `env.d/` files

docs/examples/compose/keycloak/compose.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@ services:
77
timeout: 2s
88
retries: 300
99
env_file:
10-
- env.d/kc_postgresql
10+
- env.d/kc_postgresql
1111
volumes:
12-
- ./data/keycloak:/var/lib/postgresql/data/pgdata
12+
- ./data/keycloak:/var/lib/postgresql/data/pgdata
1313

1414
keycloak:
1515
image: quay.io/keycloak/keycloak:26.1.3
1616
command: ["start"]
1717
env_file:
18-
- env.d/kc_postgresql
19-
- env.d/keycloak
18+
- env.d/kc_postgresql
19+
- env.d/keycloak
2020
# Uncomment and set your values if using our nginx proxy example
2121
# environment:
22-
# - VIRTUAL_HOST=id.yourdomain.tld # used by nginx proxy
22+
# - VIRTUAL_HOST=id.yourdomain.tld # used by nginx proxy
2323
# - VIRTUAL_PORT=8080 # used by nginx proxy
2424
# - LETSENCRYPT_HOST=id.yourdomain.tld # used by lets encrypt to generate TLS certificate
2525
depends_on:
26-
kc_postgresql::
26+
kc_postgresql:
2727
condition: service_healthy
2828
restart: true
2929
# Uncomment if using our nginx proxy example
@@ -33,4 +33,4 @@ services:
3333
#
3434
#networks:
3535
# proxy-tier:
36-
# external: true
36+
# external: true

docs/examples/compose/minio/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
```bash
1111
mkdir minio
12-
curl -o compose.yaml https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/docs/examples/compose/minio/compose.yaml
12+
curl -o minio/compose.yaml https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/docs/examples/compose/minio/compose.yaml
1313
```
1414

1515
### Step 2:. Update compose file with your own values

docs/examples/compose/minio/compose.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ services:
22
minio:
33
image: minio/minio
44
environment:
5-
- MINIO_ROOT_USER=<set minio root username>
6-
- MINIO_ROOT_PASSWORD=<set minio root password>
5+
- MINIO_ROOT_USER=<set minio root username>
6+
- MINIO_ROOT_PASSWORD=<set minio root password>
77
# Uncomment and set your values if using our nginx proxy example
88
# - VIRTUAL_HOST=storage.yourdomain.tld # used by nginx proxy
99
# - VIRTUAL_PORT=9000 # used by nginx proxy
@@ -16,12 +16,12 @@ services:
1616
entrypoint: ""
1717
command: minio server /data
1818
volumes:
19-
- ./data/minio:/data
19+
- ./data/minio:/data
2020
# Uncomment if using our nginx proxy example
2121
# networks:
22-
# - proxy-tier
22+
# - proxy-tier
2323

2424
# Uncomment if using our nginx proxy example
2525
#networks:
2626
# proxy-tier:
27-
# external: true
27+
# external: true

docs/examples/compose/nginx-proxy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Acme-companion is a lightweight companion container for nginx-proxy. It handles
1313

1414
```bash
1515
mkdir nginx-proxy
16-
curl -o compose.yaml https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/docs/examples/compose/nginx-proxy/compose.yaml
16+
curl -o nginx-proxy/compose.yaml https://raw.githubusercontent.com/suitenumerique/docs/refs/heads/main/docs/examples/compose/nginx-proxy/compose.yaml
1717
```
1818

1919
### Step 2: Edit `DEFAULT_EMAIL` in the compose file.

0 commit comments

Comments
 (0)