Skip to content

Commit dbe7d34

Browse files
authored
Merge branch 'suitenumerique:main' into fix-callout-arrow-nav
2 parents a40e538 + 83f2b38 commit dbe7d34

File tree

82 files changed

+1280
-1066
lines changed

Some content is hidden

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

82 files changed

+1280
-1066
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 6 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/Bug_report.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ labels: ["bug", "triage"]
66

77
## Bug Report
88

9+
**Before you file your issue**
10+
- Check the other [issues](https://github.com/suitenumerique/docs/issues) before filing your own
11+
- If your report is related to the ([BlockNote](https://github.com/TypeCellOS/BlockNote)) text editor, [file it on their repo](https://github.com/TypeCellOS/BlockNote/issues). If you're not sure whether your issue is with BlockNote or Docs, file it on our repo: if we support it, we'll backport it upstream ourselves 😊, otherwise we'll ask you to do so.
12+
913
**Problematic behavior**
1014
A clear and concise description of the behavior.
1115

.github/workflows/impress-frontend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
fail-on-cache-miss: true
8181

8282
- name: Set e2e env variables
83-
run: cat env.d/development/common.e2e.dist >> env.d/development/common.dist
83+
run: cat env.d/development/common.e2e >> env.d/development/common.local
8484

8585
- name: Install Playwright Browsers
8686
run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright chromium
@@ -119,7 +119,7 @@ jobs:
119119
fail-on-cache-miss: true
120120

121121
- name: Set e2e env variables
122-
run: cat env.d/development/common.e2e.dist >> env.d/development/common.dist
122+
run: cat env.d/development/common.e2e >> env.d/development/common.local
123123

124124
- name: Install Playwright Browsers
125125
run: cd src/frontend/apps/e2e && yarn install --frozen-lockfile && yarn install-playwright firefox webkit chromium

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,7 @@ venv/
4040
ENV/
4141
env.bak/
4242
venv.bak/
43-
env.d/development/*
44-
!env.d/development/*.dist
43+
env.d/development/*.local
4544
env.d/terraform
4645

4746
# npm

CHANGELOG.md

Lines changed: 40 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,42 @@ and this project adheres to
88

99
## [Unreleased]
1010

11+
### Added
12+
13+
- ✨(frontend) add duplicate action to doc tree #1175
14+
15+
### Changed
16+
17+
- ♻️(frontend) redirect to doc after duplicate #1175
18+
- 🔧(project) change env.d system by using local files #1200
19+
20+
### Fixed
21+
22+
- 🐛(service-worker) Fix useOffline Maximum update depth exceeded #1196
23+
- 🐛(helm) charts generate invalid YAML for collaboration API / WS #890
24+
25+
## [3.4.2] - 2025-07-18
26+
27+
### Changed
28+
29+
- ⚡️(docker) Optimize Dockerfile to use apk with --no-cache #743
30+
31+
### Fixed
32+
33+
- 🐛(backend) improve prompt to not use code blocks delimiter #1188
34+
35+
36+
## [3.4.1] - 2025-07-15
37+
38+
### Fixed
39+
40+
- 🌐(frontend) keep simple tag during export #1154
41+
- 🐛(back) manage can-edit endpoint without created room
42+
in the ws #1152
43+
- 🐛(frontend) fix action buttons not clickable #1162
44+
- 🐛(frontend) fix crash share modal on grid options #1174
45+
- 🐛(frontend) fix unfold subdocs not clickable at the bottom #1179
46+
1147
## [3.4.0] - 2025-07-09
1248

1349
### Added
@@ -17,7 +53,7 @@ and this project adheres to
1753
- ✨Ask for access #1081
1854
- ✨(frontend) add customization for translations #857
1955
- ✨(backend) add ancestors links definitions to document abilities #846
20-
- ✨(backend) include ancestors accesses on document accesses list view # 846
56+
- ✨(backend) include ancestors accesses on document accesses list view #846
2157
- ✨(backend) add ancestors links reach and role to document API #846
2258
- 📝(project) add troubleshoot doc #1066
2359
- 📝(project) add system-requirement doc #1066
@@ -120,7 +156,6 @@ and this project adheres to
120156
- 🐛(backend) race condition create doc #633
121157
- 🐛(frontend) fix breaklines in custom blocks #908
122158

123-
124159
## [3.1.0] - 2025-04-07
125160

126161
## Added
@@ -636,7 +671,9 @@ and this project adheres to
636671
- ✨(frontend) Coming Soon page (#67)
637672
- 🚀 Impress, project to manage your documents easily and collaboratively.
638673

639-
[unreleased]: https://github.com/numerique-gouv/impress/compare/v3.4.0...main
674+
[unreleased]: https://github.com/numerique-gouv/impress/compare/v3.4.2...main
675+
[v3.4.2]: https://github.com/numerique-gouv/impress/releases/v3.4.2
676+
[v3.4.1]: https://github.com/numerique-gouv/impress/releases/v3.4.1
640677
[v3.4.0]: https://github.com/numerique-gouv/impress/releases/v3.4.0
641678
[v3.3.0]: https://github.com/numerique-gouv/impress/releases/v3.3.0
642679
[v3.2.1]: https://github.com/numerique-gouv/impress/releases/v3.2.1

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ FROM python:3.13.3-alpine AS base
77
RUN python -m pip install --upgrade pip setuptools
88

99
# Upgrade system packages to install security updates
10-
RUN apk update && \
11-
apk upgrade
10+
RUN apk update && apk upgrade --no-cache
1211

1312
# ---- Back-end builder image ----
1413
FROM base AS back-builder
@@ -45,7 +44,7 @@ FROM base AS link-collector
4544
ARG IMPRESS_STATIC_ROOT=/data/static
4645

4746
# Install pango & rdfind
48-
RUN apk add \
47+
RUN apk add --no-cache \
4948
pango \
5049
rdfind
5150

@@ -71,7 +70,7 @@ FROM base AS core
7170
ENV PYTHONUNBUFFERED=1
7271

7372
# Install required system libs
74-
RUN apk add \
73+
RUN apk add --no-cache \
7574
cairo \
7675
file \
7776
font-noto \
@@ -117,7 +116,7 @@ FROM core AS backend-development
117116
USER root:root
118117

119118
# Install psql
120-
RUN apk add postgresql-client
119+
RUN apk add --no-cache postgresql-client
121120

122121
# Uninstall impress and re-install it in editable mode along with development
123122
# dependencies

Makefile

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -67,18 +67,18 @@ data/static:
6767

6868
# -- Project
6969

70-
create-env-files: ## Copy the dist env files to env files
71-
create-env-files: \
72-
env.d/development/common \
73-
env.d/development/crowdin \
74-
env.d/development/postgresql \
75-
env.d/development/kc_postgresql
76-
.PHONY: create-env-files
70+
create-env-local-files: ## create env.local files in env.d/development
71+
create-env-local-files:
72+
@touch env.d/development/crowdin.local
73+
@touch env.d/development/common.local
74+
@touch env.d/development/postgresql.local
75+
@touch env.d/development/kc_postgresql.local
76+
.PHONY: create-env-local-files
7777

7878
pre-bootstrap: \
7979
data/media \
8080
data/static \
81-
create-env-files
81+
create-env-local-files
8282
.PHONY: pre-bootstrap
8383

8484
post-bootstrap: \
@@ -258,20 +258,6 @@ resetdb: ## flush database and create a superuser "admin"
258258
@${MAKE} superuser
259259
.PHONY: resetdb
260260

261-
env.d/development/common:
262-
cp -n env.d/development/common.dist env.d/development/common
263-
264-
env.d/development/postgresql:
265-
cp -n env.d/development/postgresql.dist env.d/development/postgresql
266-
267-
env.d/development/kc_postgresql:
268-
cp -n env.d/development/kc_postgresql.dist env.d/development/kc_postgresql
269-
270-
# -- Internationalization
271-
272-
env.d/development/crowdin:
273-
cp -n env.d/development/crowdin.dist env.d/development/crowdin
274-
275261
crowdin-download: ## Download translated message from crowdin
276262
@$(COMPOSE_RUN_CROWDIN) download -c crowdin/config.yml
277263
.PHONY: crowdin-download

compose-e2e.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ services:
2424
restart: unless-stopped
2525
env_file:
2626
- env.d/development/common
27+
- env.d/development/common.local
2728
ports:
2829
- "4444:4444"

compose.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ services:
1010
retries: 300
1111
env_file:
1212
- env.d/development/postgresql
13+
- env.d/development/postgresql.local
1314
ports:
1415
- "15432:5432"
1516

@@ -66,7 +67,9 @@ services:
6667
- DJANGO_CONFIGURATION=Development
6768
env_file:
6869
- env.d/development/common
70+
- env.d/development/common.local
6971
- env.d/development/postgresql
72+
- env.d/development/postgresql.local
7073
ports:
7174
- "8071:8000"
7275
volumes:
@@ -91,7 +94,9 @@ services:
9194
- DJANGO_CONFIGURATION=Development
9295
env_file:
9396
- env.d/development/common
97+
- env.d/development/common.local
9498
- env.d/development/postgresql
99+
- env.d/development/postgresql.local
95100
volumes:
96101
- ./src/backend:/app
97102
- ./data/static:/data/static
@@ -135,6 +140,7 @@ services:
135140
- ".:/app"
136141
env_file:
137142
- env.d/development/crowdin
143+
- env.d/development/crowdin.local
138144
user: "${DOCKER_USER:-1000}"
139145
working_dir: /app
140146

@@ -156,6 +162,7 @@ services:
156162
restart: unless-stopped
157163
env_file:
158164
- env.d/development/common
165+
- env.d/development/common.local
159166
ports:
160167
- "4444:4444"
161168
volumes:
@@ -174,6 +181,7 @@ services:
174181
- "5433:5432"
175182
env_file:
176183
- env.d/development/kc_postgresql
184+
- env.d/development/kc_postgresql.local
177185

178186
keycloak:
179187
image: quay.io/keycloak/keycloak:20.0.1
File renamed without changes.

0 commit comments

Comments
 (0)