Commit graph

10426 commits

Author SHA1 Message Date
ansuz
e7bcd1901a Merge branch 'x2t' into staging 2021-01-08 21:25:55 +05:30
ansuz
d1eff71584 Merge branch 'soon' into staging 2021-01-08 21:23:18 +05:30
yflory
b239a528bf Minor code improvement 2021-01-08 16:51:34 +01:00
yflory
1fdacd8657 Merge branch 'z-offline2' of github.com:xwiki-labs/cryptpad into z-offline2 2021-01-08 16:48:35 +01:00
yflory
57a4d0590c Guard against forks while in offline mode 2021-01-08 16:48:17 +01:00
ansuz
1a5d9e6b91 remove hardcoded translations 2021-01-08 19:47:36 +05:30
ansuz
b1d9442008 Merge branch 'z-offline2' of github.com:xwiki-labs/cryptpad into z-offline2 2021-01-08 19:44:48 +05:30
yflory
181a4efd8b Fix race conditions and multiple tabs on the same worker 2021-01-08 15:13:45 +01:00
yflory
e2969f5ac3 Merge branch 'z-offline2' of github.com:xwiki-labs/cryptpad into z-offline2 2021-01-08 14:33:14 +01:00
yflory
2928cd2c7e Fix race condition and infinite loading screen in offline mode 2021-01-08 14:33:05 +01:00
David Benqué
b30201157b Use key for "offline no cache" error 2021-01-08 13:15:21 +00:00
ansuz
7ae7e92fef Merge branch 'soon' into z-offline2 2021-01-08 18:01:33 +05:30
Weblate
4782210d9f Translated using Weblate (French)
Currently translated at 99.4% (1403 of 1411 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2021-01-08 13:29:35 +01:00
Weblate
dc15b51aeb Translated using Weblate (English)
Currently translated at 100.0% (1411 of 1411 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1410 of 1410 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1409 of 1409 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2021-01-08 13:29:35 +01:00
Weblate
75c7ba5d4f Translated using Weblate (German)
Currently translated at 100.0% (1408 of 1408 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2021-01-08 13:19:35 +01:00
yflory
82624c10a5 Open 'cache' apps when the worker is stuck offline 2021-01-08 11:19:41 +01:00
ansuz
929159a0f4 implement server offline mode (no ws) 2021-01-08 14:49:04 +05:30
yflory
d12603c50a Fix shared folder password change with the cache 2021-01-07 17:55:41 +01:00
yflory
1f7aca39ab Improve access modal password section 2021-01-07 17:20:49 +01:00
yflory
d3db915927 Fix inconsistency between SF title in the tree and in the content 2021-01-07 16:59:29 +01:00
yflory
b7a492a11b Fix race condition between setPadTitle and drive sync 2021-01-07 16:57:52 +01:00
yflory
1f16b525d3 Don't show the password field in the modal if no password 2021-01-07 16:56:33 +01:00
yflory
bb2299376f Fix cursor error logs when not synced yet 2021-01-07 16:22:03 +01:00
yflory
a09d25a35a Stay at max scroll in rich text on content update 2021-01-07 16:21:05 +01:00
yflory
b33225e2d7 Fix safe links for pads stored in teams 2021-01-07 16:00:51 +01:00
yflory
224fae35aa Handle XXX in async store 2021-01-07 15:50:48 +01:00
yflory
77a4faa90d Fix Dom Exception with mediatags 2021-01-07 15:48:20 +01:00
yflory
3ff54a4a71 Correctly set feedback and token when the drive is synced 2021-01-07 15:47:17 +01:00
yflory
a6f9031cd6 Fix typo in translation key 2021-01-07 12:58:41 +01:00
yflory
b71ce434ce lint compliance 2021-01-07 12:48:09 +01:00
yflory
1f98ad94cc Fix merge issues 2021-01-07 12:47:17 +01:00
ansuz
beb74b46d5 merge offlineCache and soon 2021-01-07 17:15:00 +05:30
ansuz
53b91247a7 resolve merge conflicts from staging 2021-01-07 15:22:12 +05:30
David Benqué
ddf464ceab Clean up XXX notes 2021-01-07 09:17:39 +00:00
yflory
bf15530964 Use all required fonts 2021-01-06 18:34:02 +01:00
ansuz
f9f23fc464 Merge branch 'soon' into staging 2021-01-06 17:53:50 +05:30
ansuz
5bedff19b4 fix an undefined reference 2021-01-06 17:51:35 +05:30
ansuz
681b128b77 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2021-01-06 17:11:07 +05:30
ansuz
0696a339cb Merge branch 'soon' into staging 2021-01-06 17:10:48 +05:30
ansuz
ecdd1a3f43 replace cache XXX notes with ICE (in case of emergency) strings 2021-01-06 17:10:11 +05:30
ansuz
8cabe7ded8 clean up error serialization code a bit 2021-01-06 17:07:35 +05:30
David Benqué
7068b24f73 Use team favicon 2021-01-06 11:30:40 +00:00
David Benqué
f43f025a65 Update teams favicon 2021-01-06 11:00:40 +00:00
David Benqué
7606439b86 Add favicon for teams 2021-01-06 10:33:29 +00:00
ansuz
7ddeacc629 serialize localForage errors and add a safety net 2021-01-06 15:56:58 +05:30
yflory
0b82810bf3 Print fix for firefox 2021-01-05 18:40:04 +01:00
yflory
c3077ab427 Enable 'print' option in the onlyoffice menu 2021-01-05 18:20:23 +01:00
ansuz
7b1e3f6e84 Merge branch 'soon' into staging 2021-01-05 19:38:46 +05:30
ansuz
662629185d remove hardcoded translations for admin panel 2021-01-05 19:36:52 +05:30
yflory
f95af39995 lint compliance 2021-01-05 14:22:09 +01:00