Commit Graph

10208 Commits (98acca0c0edbf8f53001a71a3a67f5679cc3c085)

Author SHA1 Message Date
yflory 8feb360b88 Merge branch 'main' into soon 2020-10-21 16:02:56 +02:00
yflory 81ec200040 New OO build to fix cache issues 2020-10-21 15:53:01 +02:00
yflory 070696c7e3 New OO build 2020-10-21 15:29:13 +02:00
ansuz 100b417646 guard against several serverside typeErrors
and warn in cases where they would have occurred
2020-10-21 18:24:54 +05:30
ansuz e8428a2a73 prevent a case of multiple callbacks 2020-10-21 18:13:10 +05:30
ansuz e89c83fa89 Merge branch 'main' of github.com:xwiki-labs/cryptpad into main 2020-10-21 18:12:27 +05:30
yflory d7d25c0a71 Use correct version string for ckeditor icons 2020-10-21 13:41:36 +02:00
yflory b74c312f3c Use the new public key format in config.example.js #626 2020-10-21 12:24:59 +02:00
ansuz 06e9c81879 correct a typo 2020-10-21 14:48:47 +05:30
ansuz 8c980df660 tell clients not to cache their outer html 2020-10-21 13:11:29 +05:30
yflory 0440f8c03e Merge branch 'soon' into staging 2020-10-20 15:45:50 +02:00
yflory 19f3222da9 Exclude accounts app from the new pad menu 2020-10-20 15:45:32 +02:00
yflory a2523cd3d4 Exclude acconts app from the new pad menu 2020-10-20 15:44:19 +02:00
yflory 7b989784b8 Make sure team MEMBERS can't invite VIEWERS 2020-10-20 15:02:36 +02:00
yflory 758c33f7fd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-10-20 14:02:46 +02:00
yflory 98579cfa25 Fix team access rights 2020-10-20 14:02:35 +02:00
ansuz fbc9edd795 rename latest admin commands and implement metadata getter/remover 2020-10-20 17:12:26 +05:30
ansuz 488ec93ece allow expert admins to get and clear cached channel indices 2020-10-20 17:07:55 +05:30
ansuz b4adf65dc8 guard against a possible typeError in the worker 2020-10-20 16:31:34 +05:30
ansuz c059d801a6 Merge branch 'soon' into staging 2020-10-19 19:34:07 +05:30
yflory abeadb59e1 Fix a race condition that could break team access rights 2020-10-19 16:02:53 +02:00
ansuz ab9c7454f5 don't bother hiding the button to kick a member from a team 2020-10-19 19:32:36 +05:30
yflory 79378c536e Fix duplicate team script to support owners 2020-10-19 14:17:53 +02:00
yflory 9f389c5557 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-10-19 14:07:45 +02:00
yflory 01a8e45307 Fix duplicate team bug 2020-10-19 14:06:05 +02:00
ansuz 2644e72ad5 apply cache-busting to more ckeditor assets 2020-10-19 17:01:10 +05:30
ansuz 7c1e43e22c 3.23.1 changelog 2020-10-16 18:34:28 +05:30
yflory 01138261ab Fix shared folders 2020-10-16 14:52:21 +02:00
yflory baf71a3c04 Check if a team's pinning keys are valid 2020-10-16 14:16:57 +02:00
ansuz 94554cd964 Merge branch 'soon' into main 2020-10-16 11:22:38 +05:30
ansuz 5eecf01a72 Merge branch 'staging' into soon 2020-10-16 11:21:12 +05:30
ansuz ff8eac3ba4 increment version to 3.23.1 2020-10-16 10:13:36 +05:30
Weblate 596e240a79 Translated using Weblate (German)
Currently translated at 100.0% (1363 of 1363 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-10-16 06:28:39 +02:00
yflory ae92614289 Refresh ownership in the access modal 2020-10-15 16:09:09 +02:00
David Benqué a962114e5e Remove XXXs related to translation keys 2020-10-15 14:25:51 +01:00
Weblate 592f16a943 Translated using Weblate (French)
Currently translated at 100.0% (1363 of 1363 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-10-15 15:22:36 +02:00
Weblate 7a1def64e3 Translated using Weblate (English)
Currently translated at 100.0% (1363 of 1363 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1362 of 1362 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1361 of 1361 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-10-15 15:22:35 +02:00
yflory 854ab77f14 More improvements 2020-10-15 14:58:56 +02:00
yflory 6bdebad352 Add more steps to the loading progress bar 2020-10-15 14:48:17 +02:00
Weblate cf76bdd050 Translated using Weblate (Romanian)
Currently translated at 46.2% (629 of 1360 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/

Translated using Weblate (Romanian)

Currently translated at 44.8% (610 of 1360 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/

Translated using Weblate (Romanian)

Currently translated at 42.9% (584 of 1360 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/

Translated using Weblate (Romanian)

Currently translated at 42.8% (583 of 1360 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2020-10-15 14:30:28 +02:00
yflory 0b1a21b378 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-10-15 13:48:17 +02:00
yflory 0a06f31be3 Add missing labels to some owner actions 2020-10-15 13:48:11 +02:00
yflory 179fa06f92 Fix drive history with deleted shared folder 2020-10-15 13:38:53 +02:00
ansuz 804443e5f7 send basic team info along with support tickets
...and fix a server bug that had broken /api/config.supportMailbox
2020-10-15 15:12:12 +05:30
ansuz 713c8c574b Merge branch 'soon' into staging 2020-10-15 13:23:53 +05:30
ansuz faa7ebf399 Fix some bugs with integrated eviction
1. implement SET_LAST_EVICTION as an admin command, not a decree
2. expect a return value from Env.evictInactive and expose it via Env.evictionReport
2020-10-15 13:15:39 +05:30
yflory 20f3263429 Fix percent > 100 2020-10-14 17:53:13 +02:00
yflory 3ca37200b6 Merge branch 'staging' into loading 2020-10-14 17:33:31 +02:00
yflory b55566254f Fix FOUC in the loading screen 2020-10-14 17:32:15 +02:00
yflory fffd4aff3c lint compliance 2020-10-14 15:21:26 +02:00