4754 Commits

Author SHA1 Message Date
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
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
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
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
ClemDee
cc5d060bce Fix edit mode not default for url in drive share modal 2019-08-09 16:15:33 +02:00
ClemDee
06f224bdfe Remove infinite function call recursion in whiteboard 2019-08-09 15:20:42 +02:00
ClemDee
fb2da27115 Add download file from contextmenu in code and slide apps 2019-08-09 14:06:37 +02:00
ClemDee
73051ad30f Change save-in-your-cryptdrive icon on code contextmenu 2019-08-09 13:28:09 +02:00
ClemDee
095dfadbb0 Revert some pending stuff to be able to merge to staging 2019-08-09 11:48:57 +02:00
ansuz
2329b49678
Merge pull request #419 from xwiki-labs/readPlainTextFiles
Read plain text files
2019-08-08 17:53:03 +02:00
ClemDee
a79ddf39ad Fix missing semi-colon 2019-08-08 17:49:40 +02:00
ClemDee
98abe3d791 Add file plugin to display plain text files 2019-08-08 17:49:19 +02:00