Commit graph

8911 commits

Author SHA1 Message Date
ansuz
acf8dc45f1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into jkanban 2020-05-25 12:13:28 -04:00
yflory
806175f582 Add missing file 2020-05-25 17:22:12 +02:00
yflory
6e8ed7529f Fix issue when renaming a shared folder in the drive 2020-05-25 16:07:58 +02:00
yflory
96fcc852d6 Add a timeout for file upload if we can't make a thumbnail 2020-05-25 15:29:18 +02:00
yflory
b881b459c0 Pull dragula from bower and lint compliance for our jkanban 2020-05-25 15:15:36 +02:00
yflory
5e8fc41b06 Fix item deletion in kanban #551 2020-05-25 14:16:37 +02:00
yflory
ebf76fc5aa Merge branch 'master' into staging 2020-05-25 11:59:13 +02:00
yflory
5e9da3f652 Fix spreadsheet issues 2020-05-25 11:45:39 +02:00
ansuz
c714db561e Merge branch 'soon' into staging 2020-05-15 11:02:04 -04:00
ansuz
920c645500 Merge branch 'master' into soon 2020-05-15 11:01:57 -04:00
yflory
ee291bc0c9 Add script to fix fork issues 2020-05-15 16:32:43 +02:00
yflory
606dea38aa Fix type error in oo 2020-05-15 16:32:25 +02:00
yflory
094edfc272 Fix type error in oo 2020-05-15 16:28:52 +02:00
yflory
43f53a93fd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-05-15 16:22:22 +02:00
yflory
0567547250 Add script to fix fork issues 2020-05-15 16:22:10 +02:00
ansuz
eb9edcb6f1 Merge branch 'master' into soon 2020-05-14 18:43:17 -04:00
yflory
6456f81e0b Fix broken spreadsheets 2020-05-13 14:14:26 +02:00
Weblate
088aafb280 Translated using Weblate (French)
Currently translated at 100.0% (1271 of 1271 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-05-13 12:59:46 +02:00
Weblate
99a32ab047 Translated using Weblate (German)
Currently translated at 100.0% (1271 of 1271 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-05-13 12:59:46 +02:00
ansuz
9b5c1347a4 changelog and version update for 3.17.1 2020-05-12 11:15:23 -04:00
yflory
0881341bc6 Merge branch 'soon' into staging 2020-05-12 17:12:11 +02:00
yflory
f872f20a2b Remove a debugging console log 2020-05-12 17:11:17 +02:00
yflory
893eedacda lint compliance 2020-05-12 17:09:17 +02:00
Weblate
d5ae885a49 Translated using Weblate (French)
Currently translated at 100.0% (1271 of 1271 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-05-12 17:08:52 +02:00
Weblate
3203617b5e Translated using Weblate (English)
Currently translated at 100.0% (1271 of 1271 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-05-12 17:08:52 +02:00
yflory
2179abe3fe Fix label issue in settings 2020-05-12 16:49:07 +02:00
yflory
0036ca8861 Fix view mode in sheets 2020-05-12 15:27:00 +02:00
yflory
cb5ec4c3d4 Fix horizontal scrollbar in teams 2020-05-12 15:25:17 +02:00
yflory
a777e6f785 Merge branch 'driveUI' into may13 2020-05-12 13:46:57 +02:00
yflory
4ee62b0372 Merge branch 'ooReload' into may13 2020-05-12 13:46:54 +02:00
yflory
0018f71175 Bump cp interval in onlyoffice to 100 2020-05-12 13:46:09 +02:00
yflory
091192b697 Fix userID issues with the reload script and add reload modal 2020-05-12 13:21:56 +02:00
yflory
0feb4441da Fix misisng html flag in tippy 2020-05-11 16:12:52 +02:00
yflory
d8ebd97731 New search results UI 2020-05-07 11:51:40 +02:00
ansuz
3e71b3afac Merge branch 'master' into soon 2020-05-06 13:55:31 -04:00
ansuz
5b2929a6fc suppress some useless info from some commonly logged errors 2020-05-06 13:50:48 -04:00
ansuz
bc8a122b87 update changelog for 3.17.0 (RedGazelle) 2020-05-06 13:44:47 -04:00
yflory
ab7c31c681 Fix trim history from a pad 2020-05-06 16:50:03 +02:00
yflory
a7f98cbed9 Fix infinite loop 2020-05-06 16:31:17 +02:00
yflory
1bbea924f4 Merge branch 'soon' into driveUI 2020-05-06 14:34:11 +02:00
Weblate
3c0c9efc0f Translated using Weblate (French)
Currently translated at 100.0% (1270 of 1270 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-05-06 14:33:11 +02:00
yflory
42e2a9b35c Center state icons 2020-05-06 14:29:42 +02:00
yflory
cbc2a4e5e4 Remove sort button for folders 2020-05-06 14:25:07 +02:00
yflory
0aecea0a31 Responsive file list 2020-05-06 14:19:52 +02:00
ansuz
9f1f01f3b4 disable worker task queueing and address a probable memory leak 2020-05-05 18:06:28 -04:00
yflory
6f1b04ca57 Fix print in ckeditor with firefox 2020-05-05 18:11:00 +02:00
ansuz
b0af6b5488 fix an incorrect condition when checking for available server workers
Also, log when the RPC queue has a backlog and when it is drained
2020-05-05 10:53:42 -04:00
ansuz
fff87fd42b change a little wording in the readme 2020-05-05 09:53:22 -04:00
ansuz
f941890017 Merge branch 'guards' into staging2 2020-05-05 09:51:27 -04:00
ansuz
823c71c91f Merge branch 'soon' into staging 2020-05-05 09:42:46 -04:00