Commit graph

10165 commits

Author SHA1 Message Date
yflory
418a170dc9 Fix type error 2020-11-25 12:13:11 +01:00
yflory
a8e39237c0 Merge branch 'download' into cacheRT 2020-11-24 17:54:58 +01:00
yflory
1ac6b84c6d Merge branch 'staging' into download 2020-11-24 17:54:43 +01:00
yflory
d027005c87 Automatically download cached media-tags and improve duplicates 2020-11-24 17:54:18 +01:00
yflory
9bb465bbce Fix style conflict 2020-11-24 17:00:48 +01:00
yflory
d199da9563 lint compliance 2020-11-24 16:49:12 +01:00
yflory
93ddf51564 Merge branch 'download' into cacheRT 2020-11-24 16:46:22 +01:00
yflory
396eb4d263 Stop autodownloading big mediatags 2020-11-24 16:38:31 +01:00
yflory
1fa8be7f28 LESS improvements 2020-11-24 10:29:38 +01:00
ansuz
47f043f3d7 Merge branch 'soon' into staging 2020-11-23 17:16:35 +05:30
ansuz
8983a7cce9 Merge branch 'main' into soon 2020-11-23 17:16:18 +05:30
yflory
a29b98783a Improve download table 2020-11-20 16:38:18 +01:00
yflory
f62f447711 Improve file app UI 2020-11-19 17:58:40 +01:00
Weblate
1361dc810e Translated using Weblate (French)
Currently translated at 100.0% (1373 of 1373 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-11-19 12:27:14 +01:00
Weblate
b79f85afc4 Translated using Weblate (English)
Currently translated at 100.0% (1373 of 1373 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-11-19 12:27:14 +01:00
ansuz
d544c84697 Merge branch 'doc-id' into soon 2020-11-19 16:06:34 +05:30
yflory
d8781dbaff Fix typo 2020-11-19 15:30:51 +05:30
yflory
99ef72a6fd Fix XDR error 2020-11-19 15:30:40 +05:30
yflory
ab98895b05 Fix typo 2020-11-19 10:52:15 +01:00
yflory
3181db155e Fix XDR error 2020-11-19 10:52:04 +01:00
yflory
35909f1016 Fix typo 2020-11-19 10:49:08 +01:00
yflory
d0c782615d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-11-19 10:47:07 +01:00
yflory
6a54d9cee2 Fix XDR error 2020-11-19 10:46:42 +01:00
ansuz
733d8071fc display document ids in the properties modal 2020-11-19 13:29:48 +05:30
ansuz
cd77b5ffc8 Merge branch 'soon' into staging 2020-11-19 13:18:08 +05:30
ansuz
80574d436b Merge branch 'main' into soon 2020-11-19 13:17:57 +05:30
yflory
1aa790e02d Don't show XDR encoding errors 2020-11-19 12:36:47 +05:30
yflory
9bbc3acf3a Don't show XDR encoding errors 2020-11-19 12:36:23 +05:30
ansuz
faa84bcbd7 describe arguments for 'completeUpload' RPC 2020-11-19 12:16:02 +05:30
yflory
bd4b44476d Archive and restore UI in the admin panel 2020-11-18 16:49:40 +01:00
yflory
7b68a868ce Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-11-18 15:11:46 +01:00
yflory
d60bdbfba1 Don't show XDR encoding errors 2020-11-18 15:11:34 +01:00
ansuz
e185008846 complete uploads in child processes
also fix a nasty race condition for unowned file uploads
2020-11-18 18:26:21 +05:30
ansuz
62930f65b4 fix the iOS Firefox fix 2020-11-18 12:41:47 +05:30
ansuz
146a97bf38 Merge branch 'soon' into staging 2020-11-17 20:44:10 +05:30
yflory
7bbb46c2ef Trim history prompt 2020-11-17 16:02:06 +01:00
ansuz
700ea4c282 minimal patch and an ominous warning comment 2020-11-17 20:25:12 +05:30
ansuz
713516f751 keep bisecting to narrow down on the Firefox iOS error 2020-11-17 19:52:37 +05:30
ansuz
30e1c448d3 cleanup and lint compliance 2020-11-17 19:35:09 +05:30
ansuz
b37fd224b0 continue bisecting 2020-11-17 19:19:55 +05:30
ansuz
c9ce6da496 . 2020-11-17 19:05:05 +05:30
ansuz
58dd80b5f8 Merge branch 'soon' into wacky-debug2 2020-11-17 19:02:35 +05:30
ansuz
f608f902bf Merge branch 'child-process-fixes' into soon 2020-11-17 18:19:53 +05:30
ansuz
ebc394c4b3 expose defaultStorageLimit via /api/config 2020-11-17 18:09:34 +05:30
ansuz
0e0c0fd655 guard against typeError for unsupported notification APIs 2020-11-17 17:45:02 +05:30
ansuz
b155f7b291 increase child-process timeout and improve error handling 2020-11-17 16:09:47 +05:30
yflory
93f6619a3e Fix team always offline 2020-11-12 17:35:57 +01:00
yflory
59f427f1b5 Don't notify for old mailbox messages 2020-11-12 17:23:11 +01:00
yflory
90b4b0459e Don't notify for old mailbox messages 2020-11-12 17:20:48 +01:00
yflory
ca065e557e Improve notification prompt 2020-11-12 11:29:05 +01:00