Commit graph

6601 commits

Author SHA1 Message Date
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
1c55ac15d5 Merge branch 'staging' into editable-metadata 2019-08-16 16:43:42 +02: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
ansuz
6a5ab1ff87 update 'isNewChannel' 2019-08-14 17:34:08 +02:00
ClemDee
75732ba373 Merge branch 'exportFolderTests' into exportFolder 2019-08-14 17:33:22 +02:00
ansuz
9498669ffe remove some stale comments 2019-08-14 17:32:30 +02:00
ClemDee
a0d85c6e34 Export folder is now working in drive 2019-08-14 17:27:37 +02:00
ansuz
1e2a6405d0 make validation of channel options more strict in GET_HISTORY 2019-08-14 17:10:40 +02:00
ansuz
79e5edbdfe identify classic metadata messages by the presence of a channel attribute 2019-08-14 17:05:18 +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
548c633375 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-14 14:45:19 +02:00
ansuz
1c89e8d6ac A few updates for editable metadata
* add and update many comments
* correctly handle metadata for young channels and range requests
* add a simple implementation of 'writeMetadata'
2019-08-14 14:37:54 +02:00
ClemDee
f627837cd1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-14 10:44:50 +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
a5405cb6a0 Set properties at the bottom of the contextmenu 2019-08-14 10:30:32 +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
ansuz
f5c318f155 Merge branch 'staging' into editable-metadata 2019-08-13 15:30:11 +02:00
yflory
06748dcfb3 missing comma 2019-08-13 14:23:29 +02:00
ansuz
b7c75ea2d4 Merge branch 'staging' into editable-metadata 2019-08-13 11:05:55 +02:00
ansuz
1d13264a0d WIP minor amendments and notes for editable metadata 2019-08-13 11:04:31 +02:00
ansuz
1fb2a0976c improve readability with 'readMore' to describe what the callback does 2019-08-13 11:02:42 +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