Commit graph

5099 commits

Author SHA1 Message Date
yflory
5ade53ebba Merge branch 'soon' into staging 2021-02-25 16:13:03 +01:00
yflory
18dc5d9d23 Fix share folder with empty password 2021-02-25 16:11:37 +01:00
yflory
e692a85e1d Fix missing translation key 2021-02-25 15:09:40 +01:00
yflory
86b436582c Fix ERESTRICTED loop 2021-02-25 14:54:29 +01:00
yflory
f5a0d541a5 lint compliance 2021-02-25 14:42:18 +01:00
yflory
70b796c406 Fix shared folders with offline teams 2021-02-25 14:11:05 +01:00
yflory
058922918d Merge branch 'fixallow' into fixsf 2021-02-25 13:05:15 +01:00
yflory
daeae8b74e Fix race condition with the allow list 2021-02-25 11:27:39 +01:00
yflory
f071e2df25 Fix shared folders allow list 2021-02-25 11:15:24 +01:00
yflory
9913efad7a Merge branch 'staging' into c 2021-02-24 11:35:08 +01:00
yflory
9e0a1285a6 Merge branch 'soon' into staging 2021-02-24 11:34:57 +01:00
yflory
7cc92d1399 Disable latest fix 2021-02-24 11:34:43 +01:00
ansuz
e77a95a93e restore an accidentally removed translation 2021-02-24 15:45:30 +05:30
yflory
6cbeb9c28f Merge branch 'staging' into c 2021-02-24 10:08:39 +01:00
ansuz
cdf4006549 Merge branch 'soon' into staging 2021-02-24 09:05:48 +05:30
yflory
701d350fac Fix shared folders access list 2021-02-23 18:44:45 +01:00
yflory
193ea3033e Fix OO locks when reloading a page within the same worker 2021-02-23 17:37:37 +01:00
yflory
3496862ed9 Fix improved locks 2021-02-23 13:57:15 +01:00
yflory
ae985cef20 Merge branch 'staging' into c 2021-02-23 13:51:44 +01:00
yflory
7d6f7f374c Remove debugging log 2021-02-23 13:49:52 +01:00
yflory
94622fc34b Fix mute access requests when the pad is not in your drive 2021-02-23 13:49:25 +01:00
ansuz
a88ce23d55 Merge branch 'soon' into staging 2021-02-23 15:44:13 +05:30
Weblate
60e3fc7bd9 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
2021-02-23 11:06:32 +01:00
ansuz
a5e3deb21a
Merge pull request #686 from xwiki-labs/keys
Delete unused translation keys
2021-02-23 05:06:04 -05:00
yflory
566182f74c Delete unused translation keys 2021-02-22 18:10:20 +01:00
yflory
9069def6af lint compliance 2021-02-22 16:14:20 +01:00
yflory
437328e7af Better toolbar state message in OO strict mode 2021-02-22 15:20:51 +01:00
Weblate
5e76ae3a8c Translated using Weblate (Spanish)
Currently translated at 50.8% (702 of 1380 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
2021-02-22 14:59:01 +01:00
yflory
2172e1405c Test improved lock 2021-02-22 13:27:30 +01:00
yflory
5defa729e7 Merge branch 'offline2' into c 2021-02-22 13:10:38 +01:00
yflory
5c87c57371 Improve UI for offline teams 2021-02-22 12:58:21 +01:00
yflory
872c897ce8 Merge branch 'offline2' into c 2021-02-19 15:05:51 +01:00
yflory
4e5f8fcb99 Fix drive stuck offline 2021-02-19 15:01:52 +01:00
ansuz
53d2ca0b5e Merge branch 'ooStrict' into c 2021-02-19 16:27:26 +05:30
yflory
549a128815 Fix worker stuck offline 2021-02-18 15:00:46 +01:00
ansuz
0110342ef5 Merge branch 'staging' into offline2 2021-02-18 15:19:49 +05:30
ansuz
6a6911133e Merge branch 'ooSort' into staging 2021-02-18 15:19:01 +05:30
ansuz
1d291a04a9 Merge branch 'soon' into staging 2021-02-18 10:51:20 +05:30
Weblate
7e9031f826 Translated using Weblate (German)
Currently translated at 100.0% (1380 of 1380 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2021-02-17 21:35:35 +01:00
yflory
ecf7e28b9a Enable strict collaborative mode in OnlyOffice with support for Undo/Redo #195 2021-02-17 16:41:23 +01:00
yflory
e7e27da9f9 Fix previous commit 2021-02-17 14:58:40 +01:00
yflory
e3b823155d Guard against synchronous waitFor 2021-02-17 14:54:33 +01:00
yflory
794589ac7e Remove TODO comment 2021-02-17 14:06:28 +01:00
ansuz
baab65fa36 Merge branch 'callback' into staging 2021-02-17 17:47:57 +05:30
ansuz
fb8704ae1f remove hardcoded translation 2021-02-17 17:30:19 +05:30
ansuz
f9533d712b Merge branch 'soon' into staging 2021-02-17 17:29:55 +05:30
Weblate
5358517e9a Translated using Weblate (English)
Currently translated at 100.0% (1380 of 1380 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2021-02-17 12:31:43 +01:00
Weblate
da57a502fc Translated using Weblate (French)
Currently translated at 100.0% (1380 of 1380 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2021-02-17 12:31:43 +01:00
Weblate
435c2f9b6f Translated using Weblate (English)
Currently translated at 100.0% (1380 of 1380 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2021-02-17 12:26:12 +01:00
Weblate
24ff27d458 Translated using Weblate (French)
Currently translated at 100.0% (1380 of 1380 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2021-02-17 12:26:12 +01:00