yflory
848bbb8b2f
Merge remote-tracking branch 'origin/scalableserver' into 2026-autumn-test-scalable
2026-09-09 14:33:55 +02:00
Fabrice Mouhartem
d57ec784b2
fix(docker): add bash for office apps install script
2026-09-08 17:27:46 +02:00
yflory
df8207b5c7
Merge remote-tracking branch 'origin/prevent_doc_sharing_team' into 2026-autumn-test-scalable
2026-09-08 17:17:19 +02:00
Zuzanna Ludzik
8ff8b47f35
move handler
2026-09-08 17:13:26 +02:00
yflory
249fa44220
Merge branch 'staging' into 2026-autumn-test-scalable
2026-09-08 16:26:27 +02:00
yflory
37ccfdbae4
chore: update dependencies
2026-09-08 16:26:13 +02:00
yflory
67d8ba4d9c
Merge branch 'scalableserver' into 2026-autumn-test-scalable
2026-09-08 16:24:03 +02:00
yflory
09867cc056
chore: remove unused dependencies
2026-09-08 16:22:26 +02:00
yflory
ee366026bd
chore: rebuild worker
2026-09-07 17:22:41 +02:00
yflory
1b971e6464
Merge remote-tracking branch 'origin/forms-footer-improvements' into 2026-autumn-test-scalable
2026-09-07 17:22:31 +02:00
yflory
dfba41a5ae
Merge remote-tracking branch 'origin/setttings-labels' into 2026-autumn-test-scalable
2026-09-07 17:18:49 +02:00
yflory
6438c7c2bb
Merge remote-tracking branch 'origin/title-heading' into 2026-autumn-test-scalable
2026-09-07 17:18:33 +02:00
yflory
2c4879e628
Merge remote-tracking branch 'origin/fix(trim-team-history)' into 2026-autumn-test-scalable
2026-09-07 17:15:49 +02:00
yflory
9a98cf6f59
Merge remote-tracking branch 'origin/code_embed_print' into 2026-autumn-test-scalable
2026-09-07 17:08:01 +02:00
yflory
a8ea9af861
Merge remote-tracking branch 'origin/form_participant_print' into 2026-autumn-test-scalable
2026-09-07 17:07:53 +02:00
yflory
d54a2b5fba
Merge branch '2026-autumn-test-scalable' of github.com:cryptpad/cryptpad into 2026-autumn-test-scalable
2026-09-07 17:06:38 +02:00
yflory
ba9c66ff45
Merge remote-tracking branch 'origin/2026-autumn-test' into 2026-autumn-test-scalable
2026-09-07 17:06:07 +02:00
Fabrice Mouhartem
ed90be2bc3
chore(deps): update cryptpad-server to fix issues with Docker
2026-09-03 10:55:31 +02:00
Fabrice Mouhartem
c7003700cf
fix(docker): switch back to debian for glibc + remove localhost from infra
2026-09-03 10:54:58 +02:00
Wolfgang Ginolas
9bf78db907
Fix Office history
...
Looks like some merge problem broke it
2026-09-02 15:36:36 +02:00
Fabrice Mouhartem
8cef55f934
fix(history): accurate computation of history size
2026-09-01 17:56:05 +02:00
Fabrice Mouhartem
e1aeb6e550
fix(teams): add timeout to team trim history to not lock owners out of their team
2026-09-01 14:39:56 +02:00
Fabrice Mouhartem
48dea24019
docs(nginx): simplify nginx config + remove unused comment
2026-09-01 14:16:41 +02:00
Fabrice Mouhartem
da2cd6b788
dist(docker): unexpose port 3003 (no longer in use for ws connections)
2026-09-01 14:15:26 +02:00
Fabrice Mouhartem
e7173f5ec3
docs(config): simplify the simplified nginx example and update the advanced one
2026-08-28 17:09:29 +02:00
Fabrice Mouhartem
e1e038da8d
docs(config): update example.nginx.conf to be compatible with the new cryptpad-server
2026-08-27 15:24:50 +02:00
Fabrice Mouhartem
76c8cc3d2d
fix(scripts): update build.js js with correct path from load-config
2026-08-27 15:12:43 +02:00
Wolfgang Ginolas
444ea527d3
Merge office-9.3
2026-08-26 15:32:50 +02:00
Wolfgang Ginolas
72e34736d5
Upgrade to Euro-Office v9.3.2+2
2026-08-26 15:05:26 +02:00
Wolfgang Ginolas
665c75c04b
Rename install-office.sh
2026-08-26 15:05:02 +02:00
Fabrice Mouhartem
0a260674fc
Merge branch 'oo_image_drag' into 2026-autumn-test-scalable
2026-08-25 10:20:11 +02:00
Zuzanna Ludzik
e9c9cbe214
removed trailing whitespace
2026-08-24 18:00:20 +02:00
Zuzanna Ludzik
36580c14e1
handle drops from browser
2026-08-24 17:01:18 +02:00
Zuzanna Ludzik
b8e312d372
corrections
2026-08-24 14:46:54 +02:00
David Benque
d0113dd6b0
feat(form footer): UI fixes
...
- fix the footer containter by re-removing the cp-form-block class
- use link color rather than brand for the icon to avoid contrast issues
2026-08-21 14:05:01 +01:00
DianaXWiki
9a47115a11
Merge branch 'forms-footer-improvements' of https://github.com/cryptpad/cryptpad into forms-footer-improvements
2026-08-20 10:58:36 +02:00
DianaXWiki
e9f813b8e1
Add lock icon at the beginning of text
2026-08-20 10:52:51 +02:00
David Benque
0b86a0b972
feat(form footer): adjust UI
...
- remove form-block around footer text
- adjust message text
- remove icon appended to the end
- adjust styles (line-height, margin-bottom, ...)
- use link color rather than brand to improve link contrast
2026-08-19 14:09:33 +01:00
Wolfgang Ginolas
cbccd4abf3
Merge office-9.3
2026-08-18 14:48:45 +02:00
Wolfgang Ginolas
b68db45952
Merge office-9.3
2026-08-18 14:46:50 +02:00
Wolfgang Ginolas
834bdfe335
Update Euro-Office to v9.3.2+1
2026-08-18 14:43:37 +02:00
Zuzanna Ludzik
336147e231
remove redundant code
2026-08-14 18:37:34 +02:00
Zuzanna Ludzik
01f5da85a0
reformat
2026-08-14 18:32:05 +02:00
Zuzanna Ludzik
dd6030ef84
refactor
2026-08-14 18:30:51 +02:00
yflory
fd955563ee
Merge branch 'scalableserver' into 2026-autumn-test-scalable
2026-08-14 17:44:15 +02:00
yflory
566e40ae9b
chore: update package.json
2026-08-14 17:42:49 +02:00
Fabrice Mouhartem
33e6655fdd
chore(compatibility): load infra config from config.js if infra.js is not provided
2026-08-14 16:18:02 +02:00
yflory
5636a6fc4e
Merge remote-tracking branch 'origin/onlyoffice_spellcheck' into 2026-autumn-test
2026-08-14 16:12:57 +02:00
yflory
ae42efd9c8
Merge branch '2026-autumn-test' of github.com:cryptpad/cryptpad into 2026-autumn-test
2026-08-14 16:03:19 +02:00
yflory
8d38b2f8e4
Merge remote-tracking branch 'origin/remove_form_margins' into 2026-autumn-test
2026-08-14 15:54:22 +02:00
