Commit graph

8548 commits

Author SHA1 Message Date
yflory
a6f8160ab4 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-03-24 18:38:23 +01:00
yflory
ba4614f0e8 Fix a type error in onlyoffice 2020-03-24 18:38:08 +01:00
yflory
facc6d877a Remove hardcoded translation key 2020-03-24 18:36:55 +01:00
ansuz
0e09c73a60 Merge branch 'master' into soon 2020-03-24 13:32:42 -04:00
ansuz
a2facc4a0d
Merge pull request #513 from 7adietri/patch-1
Add shutdown() to non-disk logger
2020-03-24 13:32:13 -04:00
ansuz
e128683ffb call back with errors instead of throwing within the Storage module 2020-03-24 13:31:03 -04:00
ansuz
1240f4a2a5 Merge branch 'master' into soon 2020-03-24 13:04:25 -04:00
ansuz
90899aa2f4 start reviewing and removing XXX notes 2020-03-24 13:03:49 -04:00
yflory
64596b8097 lint compliance 2020-03-24 16:16:25 +01:00
yflory
fe14399e67 Merge branch 'whiteboard' into soon 2020-03-24 16:15:13 +01:00
yflory
ae1b59b2c1 Fix canvas initial size 2020-03-24 15:32:56 +01:00
yflory
24e474e688 Big canvas 2020-03-24 15:25:58 +01:00
yflory
9aaddea148 Add edPublic to user profiles 2020-03-24 13:18:32 +01:00
yflory
e74f713983 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-03-24 12:40:57 +01:00
yflory
a4d1b47a4c Fix 'readonly' mode after disconnection in onlyoffice 2020-03-24 12:40:13 +01:00
yflory
2c4c18bef6 Merge branch 'soon' into staging 2020-03-24 12:39:33 +01:00
ansuz
2ef0af29e5 guard against index worker rpc responses for a txid with no supplied callback 2020-03-23 22:03:59 -04:00
ansuz
cc335a54b1 update chainpad-server to latest version 2020-03-23 18:56:04 -04:00
ansuz
ee8d5c9c36 fix the premiumUploadSize validation to check the correct attribute 2020-03-23 16:13:48 -04:00
yflory
2fe417bf52 Send contacts public data to accounts 2020-03-23 18:01:52 +01:00
yflory
dc0b26da0b Merge branch 'soon' into staging 2020-03-23 12:33:17 +01:00
yflory
de456cd70a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-03-23 12:32:21 +01:00
yflory
8e8b371690 Fix issues with trim history in spreadsheets 2020-03-23 12:32:03 +01:00
Weblate
f3e6c6c36d Translated using Weblate (Italian)
Currently translated at 69.7% (865 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-23 11:53:37 +01:00
yflory
7ddc472658 Restore Dutch translation 2020-03-23 11:53:21 +01:00
Weblate
6d305cd411 Translated using Weblate (Portuguese (Brazil))
Currently translated at 26.6% (330 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/pt_BR/
2020-03-23 11:44:56 +01:00
Weblate
74743610d5 Translated using Weblate (Polish)
Currently translated at 7.9% (98 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/pl/
2020-03-23 11:44:56 +01:00
Weblate
e03edf2762 Translated using Weblate (Spanish)
Currently translated at 67.2% (834 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
2020-03-23 11:44:56 +01:00
Weblate
4cc3091270 Translated using Weblate (Italian)
Currently translated at 69.6% (864 of 1241 strings)

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

Translated using Weblate (Italian)

Currently translated at 69.6% (864 of 1241 strings)

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

Translated using Weblate (Italian)

Currently translated at 49.4% (613 of 1241 strings)

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

Translated using Weblate (Italian)

Currently translated at 49.4% (613 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-23 11:44:56 +01:00
Weblate
f672abf939 Translated using Weblate (Swedish)
Currently translated at 0.8% (10 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/sv/
2020-03-23 11:44:56 +01:00
Weblate
de1f57ca63 Translated using Weblate (Japanese)
Currently translated at 1.8% (22 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ja/
2020-03-23 11:44:55 +01:00
Weblate
43c8d52352 Translated using Weblate (Norwegian Bokmål)
Currently translated at 23.9% (296 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/nb_NO/
2020-03-23 11:44:55 +01:00
Weblate
638f4ff955 Translated using Weblate (Russian)
Currently translated at 43.0% (534 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2020-03-23 11:44:55 +01:00
Weblate
014115fbc5 Translated using Weblate (English)
Currently translated at 100.0% (1241 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-03-23 11:44:55 +01:00
Weblate
399f4a27a6 Translated using Weblate (Chinese (Simplified))
Currently translated at 26.5% (329 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/zh_Hans/
2020-03-23 11:44:55 +01:00
Weblate
4d9e2cd740 Translated using Weblate (Romanian)
Currently translated at 43.1% (535 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ro/
2020-03-23 11:44:55 +01:00
Weblate
4e16bc2dcc Translated using Weblate (Swedish)
Currently translated at 0.6% (8 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/sv/
2020-03-21 16:14:44 +01:00
Weblate
46aa0c633d Translated using Weblate (Italian)
Currently translated at 41.6% (516 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-21 16:14:44 +01:00
Weblate
ca4724f8e0 Added translation using Weblate (Swedish) 2020-03-21 15:10:07 +01:00
Weblate
0e18d1f8d6 Translated using Weblate (Italian)
Currently translated at 41.0% (509 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-21 15:10:07 +01:00
Weblate
f7ee77749a Translated using Weblate (Italian)
Currently translated at 40.9% (508 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-21 15:08:01 +01:00
ansuz
a8b2c03dbf avoid merge conflict with weblate 2020-03-21 10:07:46 -04:00
Weblate
4a37a386e7 Translated using Weblate (Italian)
Currently translated at 40.7% (505 of 1241 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-03-21 15:03:58 +01:00
ansuz
552966a1f6 add Svenska translation 2020-03-21 09:57:49 -04:00
Alexander
a190af079d
Add shutdown() to non-disk logger
The script `evict-inactive.js` calls `Log.shutdown()` at the end, which currently fails if logging to disk has been disabled via `logPath`.
2020-03-21 14:43:25 +01:00
ansuz
ed63d98ab0 Merge branch 'scaling-index' into soon 2020-03-20 18:57:51 -04:00
ansuz
bf2e5aeca1 add an admin panel block to display the open file count 2020-03-20 17:04:18 -04:00
ansuz
f9706623d5 Merge branch 'soon' into staging 2020-03-20 13:22:40 -04:00
ansuz
605aae222c update less devDependency to match client version 2020-03-20 13:21:50 -04:00
ansuz
590e249500 resolve merge conflict 2020-03-20 13:07:35 -04:00