Commit graph

4643 commits

Author SHA1 Message Date
yflory
d59b2f513f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-23 16:20:05 +02:00
Weblate
e4ecf02774 Translated using Weblate (German)
Currently translated at 100.0% (1039 of 1039 strings)

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

Translated using Weblate (German)

Currently translated at 100.0% (1039 of 1039 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2019-08-23 14:19:56 +00:00
Weblate
eabe639e7c Translated using Weblate (French)
Currently translated at 100.0% (1041 of 1041 strings)

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

Translated using Weblate (French)

Currently translated at 99.9% (1038 of 1039 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2019-08-23 14:19:56 +00:00
Weblate
753ba85983 Translated using Weblate (English)
Currently translated at 100.0% (1041 of 1041 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1040 of 1040 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1039 of 1039 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2019-08-23 14:19:56 +00:00
yflory
c95db33157 Improve pricing visibility 2019-08-23 16:19:45 +02:00
yflory
74372ba5d4 Disable Ctrl+E modal in share and filepicker modals 2019-08-23 12:16:48 +02:00
yflory
ae1e221bdc Remove useless X in the download table 2019-08-22 18:04:38 +02:00
yflory
fc72861721 Prevent users from opening a pad with the wrong app 2019-08-22 14:01:07 +02:00
yflory
f966a479de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-20 13:55:46 +02:00
yflory
24ea640397 Kill the testworker to save memory usage 2019-08-20 13:55:37 +02:00
Clément Desableau
e1477bd32e Make context submenus don't overflow on Y axis 2019-08-20 01:58:49 +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
ClemDee
58a3f76464 Fix two comments 2019-08-16 14:35:07 +02:00
ClemDee
f2063f3748 Remove translation fallbacks 2019-08-16 13:56:25 +02:00
ClemDee
e8c98200ec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-16 13:52:32 +02:00
ClemDee
a00ac64e0e Remove translation fallback 2019-08-16 13:51:55 +02:00
ClemDee
79b667c835 Remove translation fallback 2019-08-16 13:51:16 +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
792ce4133b Fix a little thing that disappeared with the merge 2019-08-14 17:54:01 +02:00
ClemDee
75732ba373 Merge branch 'exportFolderTests' into exportFolder 2019-08-14 17:33:22 +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