Commit graph

596 commits

Author SHA1 Message Date
yflory
b1dab8e75a Add team usage bar 2019-09-23 15:45:24 +02:00
yflory
634d24b46c Team APP UI 2019-09-06 18:47:18 +02:00
yflory
834e12fcba Teams: async-store refactoring 2019-09-06 15:45:56 +02:00
yflory
7222d34dc0 Refactor async-store to make it work with teams 2019-09-05 13:56:47 +02:00
yflory
37b3c2f10c Split drive inner.js and less 2019-09-04 16:00:16 +02:00
yflory
a6a40c3f6a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-09-03 17:05:23 +02:00
yflory
c4dcfc9ccf Fix redraw ownership modal in drive 2019-09-03 13:45:32 +02:00
yflory
9822c28f3b Implement ADD_OWNER notification with pending_owner metadata 2019-08-30 16:41:48 +02:00
ansuz
1b7d984d39 Merge branch 'soon' into staging 2019-08-30 11:57:46 +02:00
ansuz
ebf41e93c0 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2019-08-29 12:13:23 +02:00
yflory
2416587466 Disable convertToSharedFolder 2019-08-29 12:12:14 +02:00
yflory
3e53e43752 Fix drive export from settings and exported folder name 2019-08-29 11:01:06 +02:00
yflory
0368bbad76 Fix drive export from settings and exported folder name 2019-08-28 16:53:18 +02:00
yflory
f6762f7c01 Make the friends list from the share modal reusable 2019-08-28 15:29:38 +02:00
yflory
8957bbd782 Ability to set ownership and password when sharing a folder 2019-08-27 10:53:41 +02:00
Clément Desableau
e1477bd32e Make context submenus don't overflow on Y axis 2019-08-20 01:58:49 +02:00
ansuz
08e9080dec
Merge pull request #428 from xwiki-labs/folderToSF
Folder to sf
2019-08-19 12:12:22 +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
ansuz
bf3e638adc resolve merge conflicts, lint compliance 2019-08-16 16:02:10 +02: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
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
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
2ee3b77a43 Merge branch 'staging' into exportFolderTests 2019-08-14 14:58:38 +02:00
ClemDee
bb9898fa35 Download files code refractoring 2019-08-14 14:49:40 +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
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
ClemDee
e1655ccd5c Drive contextmenu handlers optimisation 2019-08-12 15:40:26 +02:00
ClemDee
6548ec346c Add missing semicolon 2019-08-12 15:31:21 +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
ClemDee
6bcf9f13d3 Merge branch 'staging' into responsiveContextmenu 2019-08-12 12:16:07 +02:00
ClemDee
095dfadbb0 Revert some pending stuff to be able to merge to staging 2019-08-09 11:48:57 +02:00
ansuz
592df7e152
Merge pull request #418 from xwiki-labs/cryptDriveStuff
Crypt drive stuff
2019-08-08 17:27:31 +02:00
ClemDee
24b1720d48 Improve APP.isMobile function 2019-08-08 17:04:09 +02:00
ansuz
1a8460aa11
Merge pull request #413 from xwiki-labs/driveHorizontalScrollbar
Fix horizontal scrollbar in drive
2019-08-08 15:54:21 +02:00
ClemDee
5e1426bee0 Remove test context submenus 2019-08-07 12:27:19 +02:00
ClemDee
38e955e490 Set timeout before hiding submenu 2019-08-07 12:14:10 +02:00
ClemDee
3191b3cbdd Fix remaining context submenu issues 2019-08-07 12:06:55 +02:00
ClemDee
7e1425394a Move all create new pad in a submenu of the contextmenu 2019-08-07 10:43:31 +02:00