Commit Graph

4106 Commits (7153441e4768257687cc70446bf5be4ecc6a1a10)

Author SHA1 Message Date
ansuz 7153441e47 resolve merge conflicts with t and staging 2020-05-28 10:08:08 -04:00
ansuz 4a6921ee6a Merge branch 'staging' into doc-premerge 2020-05-28 09:56:45 -04:00
yflory 20f7c0924b Fix XXX 2020-05-28 12:39:36 +02:00
yflory d1670d214a lint compliance 2020-05-28 12:18:34 +02:00
yflory 1a54f87b5b Improve sort button in drive 2020-05-28 12:17:32 +02:00
ansuz 043b2d24ea remove invalid XXX note 2020-05-27 12:26:24 -04:00
yflory 6e30a7546d Merge branch 'temp' into t 2020-05-27 16:32:38 +02:00
yflory 4cf775e613 Sort button in the drive 2020-05-27 16:32:28 +02:00
yflory c8bac778d5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-05-27 13:22:11 +02:00
yflory 446a429d6b Fix share modal in anon drive 2020-05-27 13:21:59 +02:00
yflory aef0f29c2f Drag from recent pads 2020-05-27 12:43:52 +02:00
ansuz c34ea105f0 hide drawers on ESC keypresses 2020-05-26 16:22:45 -04:00
ansuz 2f67d7cccc Merge branch 'soon' into staging 2020-05-26 12:51:59 -04:00
ansuz 6f882e0ddd refactor repeated 'drawer' pattern 2020-05-26 12:51:37 -04:00
Weblate 2a3b1a6ddc Translated using Weblate (German)
Currently translated at 100.0% (1281 of 1281 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-05-26 18:34:20 +02:00
ansuz 2925316058 remove hardcoded translations 2020-05-26 11:52:02 -04:00
Weblate 1f636f3c4a Translated using Weblate (English)
Currently translated at 100.0% (1281 of 1281 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1281 of 1281 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1280 of 1280 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1279 of 1279 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1278 of 1278 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1277 of 1277 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1276 of 1276 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1275 of 1275 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1274 of 1274 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1273 of 1273 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1272 of 1272 strings)

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

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/

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-26 17:01:51 +02:00
Weblate 57cda316c6 Translated using Weblate (French)
Currently translated at 100.0% (1281 of 1281 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-05-26 17:01:51 +02:00
yflory 234f284647 Fix request access button when the pad is not stored 2020-05-26 16:55:25 +02:00
yflory c9a0eef5f1 Remove X button in chat and userlist panels 2020-05-26 16:12:19 +02:00
yflory 6ba9bd5757 Export to .doc 2020-05-26 12:11:51 +02:00
ansuz 264f4950bd don't show the help menu in embed mode 2020-05-25 17:12:12 -04:00
ansuz 73a168f09b mark hardcoded translations and duplicated code with XXX 2020-05-25 16:18:59 -04:00
ansuz 4c660d5e89 Merge branch 'master' into soon 2020-05-25 12:49:28 -04:00
ansuz 52058bfcfc Merge branch 'staging' into toolbarUI-premerge 2020-05-25 12:14:45 -04:00
yflory e17612ad79 lint compliance 2020-05-25 17:30:42 +02:00
yflory 5441a499ba Fix share and burn buttons in drive toolbar 2020-05-25 17:29:13 +02:00
yflory bc3d827ce0 Remove the X in the drive tree 2020-05-25 17:21:55 +02:00
yflory e28d4695c5 Fix notifications button title in top bar 2020-05-25 17:08:12 +02:00
yflory 6e8ed7529f Fix issue when renaming a shared folder in the drive 2020-05-25 16:07:58 +02:00
yflory b9bd141b24 Fix tag search issues 2020-05-25 15:55:07 +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 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
yflory f4daddd6b1 Merge branch 'toolbarUI' of github.com:xwiki-labs/cryptpad into toolbarUI 2020-05-15 17:55:58 +02:00
yflory 5136a023f1 Fix issues with the file path in the search results 2020-05-15 17:55:44 +02:00
ansuz 920c645500 Merge branch 'master' into soon 2020-05-15 11:01:57 -04:00
ansuz edb7618ce4 Merge branch 'staging' into toolbarUI 2020-05-15 10:35:45 -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
yflory ad9a10701d Fix tag link in drive 2020-05-15 16:14:07 +02:00
yflory 03ba45dd77 Merge branch 'toolbarUI' of github.com:xwiki-labs/cryptpad into toolbarUI 2020-05-15 15:31:34 +02:00
yflory de684edfe2 Todo migration 2020-05-15 15:27:55 +02:00
David Benqué 9ae625e04a Merge remote-tracking branch 'origin/toolbarUI' into toolbarUI 2020-05-15 13:10:39 +01:00
David Benqué e6112d27ee change icons for files in drive 2020-05-15 13:09:56 +01:00
yflory fb10d65a4f Remove context button in the drive toolbar 2020-05-15 13:56:33 +02:00
yflory 303d4fdd3a Fix colors for the help, chat and userlist boxes 2020-05-15 13:50:36 +02:00