Commit Graph

14933 Commits

Author SHA1 Message Date
yflory
e52d9f77c1 Merge branch 'staging' into invitations 2023-12-19 15:03:40 +01:00
yflory
35ea39631b Merge branch '5.6-rc' into staging 2023-12-19 13:19:20 +01:00
David Benque
06f4b8e590 Add licensing information to new files 2023-12-19 11:38:26 +00:00
Wolfgang Ginolas
32c22a8b61 Fix race condition on OnlyOffice
https://github.com/cryptpad/cryptpad/issues/1319
2023-12-19 10:53:45 +01:00
Wolfgang Ginolas
37cfc8a35f Fix race condition on OnlyOffice
https://github.com/cryptpad/cryptpad/issues/1319
2023-12-19 08:39:48 +01:00
yflory
4c81c95a94 Remove missing SSO config log 2023-12-18 15:53:43 +01:00
yflory
30d956b52f Fix ws proxy issue with :: as httpAddress 2023-12-18 15:47:10 +01:00
yflory
f9e6c8d142 tMerge branch 'main' into 5.6-rc 2023-12-18 14:07:13 +01:00
yflory
315adc59d7 Update version number 2023-12-18 14:06:28 +01:00
yflory
568bff357e Fix server error 2023-12-18 10:08:52 +01:00
yflory
94a1642d7b Fix margin errors in dropdown with some browsers/OS 2023-12-15 17:23:28 +01:00
yflory
461d276d16 Fix SSO+MFA issues 2023-12-15 17:10:21 +01:00
yflory
9b00a6e9d4 Merge branch '5.6-rc' of github.com:cryptpad/cryptpad into 5.6-rc 2023-12-15 16:07:22 +01:00
yflory
01de1b9f47 Update sso example conf 2023-12-15 16:06:25 +01:00
yflory
576e713d70 Add plugins directory 2023-12-15 15:39:12 +01:00
David Benque
9cd86d03a4 REUSE lint compliance 2023-12-15 15:38:01 +01:00
yflory
a1a3f1fefe Merge branch 'staging' of github.com:cryptpad/cryptpad into staging 2023-12-15 15:14:44 +01:00
yflory
124788c412 Fix keyboard shortcuts in lightbox view 2023-12-15 15:14:31 +01:00
David Benque
e100f74505 Remove un-used translation 2023-12-14 11:12:09 +00:00
David Benque
a4a6b1363e
Merge pull request #1335 from cryptpad-team/weblate-cryptpad-app
Translations update from CryptPad Translations
2023-12-14 10:55:21 +00:00
Weblate
f01f92b177 Added translation using Weblate (Chinese (Traditional))
Co-authored-by: Mathilde <mathilde.grunig@xwiki.com>
Co-authored-by: Weblate <noreply@weblate.org>
2023-12-14 11:54:02 +01:00
Weblate
ef7c0ac6fa Translated using Weblate (French)
Currently translated at 100.0% (1679 of 1679 strings)

Translated using Weblate (French)

Currently translated at 100.0% (1676 of 1676 strings)

Co-authored-by: Mathilde <mathilde.grunig@xwiki.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/fr/
Translation: CryptPad/App
2023-12-14 11:54:02 +01:00
Weblate
b0ce8fc5ab Translated using Weblate (English)
Currently translated at 100.0% (1682 of 1682 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1682 of 1682 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1681 of 1681 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1680 of 1680 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1679 of 1679 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1678 of 1678 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1677 of 1677 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1676 of 1676 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1676 of 1676 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1675 of 1675 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1674 of 1674 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1673 of 1673 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1672 of 1672 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1671 of 1671 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1670 of 1670 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1669 of 1669 strings)

Translated using Weblate (English)

Currently translated at 100.0% (1668 of 1668 strings)

Co-authored-by: Anonymous <noreply@weblate.org>
Co-authored-by: David Benqué <david.benque@xwiki.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: https://weblate.cryptpad.org/projects/cryptpad/app/en/
Translation: CryptPad/App
2023-12-14 11:54:01 +01:00
David Benque
3825b07339 Merge branch 'staging' of github.com:cryptpad/cryptpad into staging 2023-12-14 10:53:13 +00:00
David Benque
7f596b6776 Fix focus styles in toolbar 2023-12-14 10:53:10 +00:00
yflory
79f766af28 Merge branch 'staging' of github.com:cryptpad/cryptpad into staging 2023-12-14 11:47:23 +01:00
yflory
32494461b4 Fix double 'Open' entry in drive tree contextmenu 2023-12-14 11:47:14 +01:00
David Benque
1c77d0699f Remove hard-coded translation strings 2023-12-14 10:44:23 +00:00
yflory
3076a35c28
Merge pull request #1305 from cryptpad/mobile_form_closing_datepicker
Forms bug fixes and feature requests
2023-12-14 11:22:24 +01:00
zuzanna-maria
d29f0f4221 removed redundant code 2023-12-13 18:59:23 +01:00
yflory
7c64779796 lint compliance 2023-12-13 16:32:00 +01:00
yflory
bebbed8e05 Merge branch 'rich-text-small-screen' into staging 2023-12-13 16:30:03 +01:00
yflory
45ac8d901f Remove CSP warnings in the console with CkEditor toolbar 2023-12-13 16:27:20 +01:00
DianaXWiki
36e4837d08 Fix toolbar keyboard nav linux #1272 2023-12-13 17:00:18 +02:00
yflory
2666894f19 Merge branch 'staging' of github.com:cryptpad/cryptpad into staging 2023-12-13 15:38:58 +01:00
yflory
d51bd92aa6 Merge branch 'feature-calendar-description' into staging 2023-12-13 15:38:47 +01:00
Mathilde
702619158a
Merge pull request #1327 from cryptpad/cleanup-repo
Cleanup repo from outdated/misplaced files
2023-12-13 15:36:51 +01:00
Mathilde
09db238b96
Merge pull request #1287 from llaumgui/patch-1
Add healthcheck
2023-12-13 15:35:38 +01:00
yflory
7ba29238b2 Merge branch 'forcemfa' into staging 2023-12-13 15:21:54 +01:00
yflory
df6b0a0e98 Merge branch 'authsso' into staging 2023-12-13 15:14:31 +01:00
yflory
3da0eec8a7 Merge branch 'fixTimeZone' into staging 2023-12-13 15:13:14 +01:00
yflory
a6427766e9
Merge pull request #1315 from cryptpad/premiumTeams
Option to increase team slots for premium users only
2023-12-13 15:09:16 +01:00
yflory
16b5539ba8
Merge pull request #1290 from cryptpad/toolbar
Toolbar accessibility improvements
2023-12-13 15:08:55 +01:00
yflory
01f13b6b78 Remove outline on drive content container when focused 2023-12-13 15:08:30 +01:00
yflory
993d64e603
Merge pull request #1307 from cryptpad/kanban_tag_display_mobile
Changed positioning of kanban tag container on smaller screens
2023-12-13 15:02:52 +01:00
yflory
0fb82aa688 Fix XXX comment 2023-12-13 15:02:28 +01:00
yflory
906cd1cb15 Fix margin issues with kanban tags 2023-12-13 14:59:38 +01:00
yflory
d5a321af16 Fix keydown event conflict between dropdown and drive 2023-12-13 14:25:48 +01:00
yflory
ae11088b8a Merge branch 'staging' into toolbar 2023-12-13 14:19:43 +01:00
yflory
d25bd9ffc7 Fix keyboard navigation in the drive 2023-12-13 14:18:48 +01:00