Commit Graph

2741 Commits (337e0bd141361d8d975a5cd1b5ac88df94725fcf)

Author SHA1 Message Date
yflory 24ea640397 Kill the testworker to save memory usage 2019-08-20 13:55:37 +02:00
yflory 06809fd3ba Update codemirror settings in realtime 2019-08-19 16:53:17 +02:00
yflory 92a41f84f7 Fix wrong owner in the properties modal 2019-08-19 16:00:55 +02:00
yflory c608bdd2dc Merge branch 'off' into staging 2019-08-19 15:38:22 +02:00
yflory 656b129543 Ability to remove handlers from worker-channel and metadata-manager 2019-08-19 15:37:08 +02:00
yflory c1656d7b5b Merge branch 'unifiedMetadata' into staging 2019-08-19 15:27:59 +02:00
yflory 6f0062d023 Add comments and timeout errors 2019-08-19 14:37:55 +02:00
yflory 3dba20776f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-19 13:40:24 +02:00
yflory 7988a30338 Fix folder upload UI 2019-08-19 13:39:40 +02:00
ansuz 08e9080dec
Merge pull request #428 from xwiki-labs/folderToSF
Folder to sf
2019-08-19 12:12:22 +02:00
ansuz a368948fb6 handle errors when converting folders to shared folders 2019-08-19 12:06:06 +02:00
ansuz 7d583975b8 fix a few things, add comments for others 2019-08-19 11:56:52 +02:00
ansuz 5dacc6ceeb Merge branch 'soon' into staging 2019-08-16 17:39:54 +02:00
ansuz 04feef793b resolve merge conflicts 2019-08-16 17:39:22 +02:00
Weblate 1af467aa84 Translated using Weblate (French)
Currently translated at 100.0% (1039 of 1039 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-08-16 14:51:04 +00:00
ansuz dc65213130 Merge branch 'merge-plainTextFiles' into staging 2019-08-16 16:02:53 +02:00
ClemDee bd717f16e3 Add translation keys 2019-08-16 16:02:29 +02:00
ansuz bf3e638adc resolve merge conflicts, lint compliance 2019-08-16 16:02:10 +02:00
Weblate c9569a136d Translated using Weblate (Russian)
Currently translated at 48.7% (502 of 1030 strings)

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

Translated using Weblate (Russian)

Currently translated at 47.1% (485 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
2019-08-16 13:37:15 +00:00
Weblate c555a0f500 Translated using Weblate (Portuguese (Brazil))
Currently translated at 32.3% (333 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/pt_BR/
2019-08-16 13:37:15 +00:00
Weblate 242677300b Translated using Weblate (German)
Currently translated at 100.0% (1030 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-08-16 13:37:15 +00:00
Weblate 3511f3b802 Translated using Weblate (French)
Currently translated at 100.0% (1030 of 1030 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-08-16 13:37:15 +00:00
ansuz 32fa527dc9
Merge pull request #427 from xwiki-labs/exportFolder
Export folder
2019-08-16 15:02:02 +02:00
yflory c4a90a90f2 Fix disconnection event not propagating to the UI 2019-08-16 11:33:57 +02:00
yflory ba24cde76d Fix cryptget not stopping chainpad-netflux when done 2019-08-16 10:23:58 +02:00
ClemDee a0d85c6e34 Export folder is now working in drive 2019-08-14 17:27:37 +02:00
ClemDee 51241bda48 Merge branch 'staging' into exportFolderTests 2019-08-14 15:59:59 +02:00
yflory a327f4a0bf Fix cryptget memory issues 2019-08-14 15:59:16 +02:00
ClemDee f017215300 Add progress bar for pad download 2019-08-14 15:42:32 +02:00
yflory 9c26df4213 Add comments 2019-08-14 15:12:44 +02:00
ClemDee 2ee3b77a43 Merge branch 'staging' into exportFolderTests 2019-08-14 14:58:38 +02:00
yflory 3e56a88173 Add progress data when using cryptget 2019-08-14 14:57:14 +02:00
ClemDee bb9898fa35 Download files code refractoring 2019-08-14 14:49:40 +02:00
yflory eaeb995661 Remove debugging code 2019-08-14 10:38:42 +02:00
ClemDee 2a2f45ec25 Remove translation fallbacks 2019-08-14 10:36:53 +02:00
ClemDee 4f84a928a9 Small fixes and improvements 2019-08-13 18:05:03 +02:00
ClemDee f55c8c6b04 Open plain text files in code app && plain text files thumbnail 2019-08-13 16:09:06 +02:00
yflory 06748dcfb3 missing comma 2019-08-13 14:23:29 +02:00
ClemDee 23dc301eb1 Small fixes in sframe-common-file 2019-08-12 18:44:25 +02:00
yflory bbd59c6a2b Don't freeze the UI with old (invalid) states of the drive history 2019-08-12 16:14:51 +02:00
yflory 21658e9de1 Fix restoring an older version of the drive 2019-08-12 15:52:48 +02:00
yflory 970dcb8b8b null is an object 2019-08-12 15:40:25 +02:00
yflory 3303e9738d Fix drive deletion 2019-08-12 15:38:21 +02:00
yflory 5c6b3155ac Add safety measures to avoid removing your drive by accident 2019-08-12 15:30:59 +02:00
yflory d823deff92 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-12 12:15:17 +02:00
yflory a0598bf377 Fix infinite onChange loop in metadata 2019-08-12 12:15:06 +02:00
ansuz ecffe23c08
Merge pull request #424 from xwiki-labs/fixSharingSettings
Fix edit mode not default for url in drive share modal
2019-08-12 11:12:35 +02:00
ansuz c76c3130cb
Merge pull request #423 from xwiki-labs/downloadFilesFromPad
Download files from pad
2019-08-12 10:55:42 +02:00
ClemDee c3c918cce7 Fix classname of contextmenu options 2019-08-12 10:55:03 +02:00
ansuz da3763a14b
Merge pull request #422 from xwiki-labs/contextmenuIconsEverywhere
Contextmenu icons everywhere
2019-08-12 10:52:07 +02:00