Commit Graph

4589 Commits (1c55ac15d5a5f2cb6d7b227a99fe78cdbdcf2a4d)

Author SHA1 Message Date
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 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
yflory 548c633375 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-14 14:45:19 +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 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
yflory 06748dcfb3 missing comma 2019-08-13 14:23:29 +02:00
ClemDee e1655ccd5c Drive contextmenu handlers optimisation 2019-08-12 15:40:26 +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 20ba9f86ff Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-08-12 15:34:08 +02:00
ansuz 628b8866cb
Merge pull request #426 from xwiki-labs/responsiveContextmenu
Responsive contextmenu
2019-08-12 15:31:54 +02:00
ClemDee 6548ec346c Add missing semicolon 2019-08-12 15:31:21 +02:00
yflory 5c6b3155ac Add safety measures to avoid removing your drive by accident 2019-08-12 15:30:59 +02:00
ClemDee 4351ece256 Change 'Other pads' title to 'More Pads' in contextmenu 2019-08-12 15:29:13 +02:00
ClemDee 1b05fb982c Ensure there are not two context submenus opened at the same time 2019-08-12 15:26:07 +02:00
ClemDee 9586695c75 Reorganize / add pads in contextmenu 2019-08-12 15:22:15 +02:00
ansuz 0de0d46dd3
Merge pull request #425 from xwiki-labs/fixTippyInWhiteboard
Fix tippy in whiteboard
2019-08-12 14:27:17 +02:00
ClemDee 6bcf9f13d3 Merge branch 'staging' into responsiveContextmenu 2019-08-12 12:16:07 +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
ClemDee b481b99441 Fix infinite function call recursion in whiteboard 2019-08-12 11:44:24 +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
ClemDee e29e105bb0 Add comment to get the code more friendly 2019-08-12 10:50:12 +02:00