Commit graph

319 commits

Author SHA1 Message Date
yflory
8738b42861 Update the drive UI to show that Upload and New are linked to a folder 2017-06-14 17:51:48 +02:00
yflory
a98353af6c Add a button to upload a file in the drive 2017-06-14 15:55:03 +02:00
yflory
7e0a2abc2c Fix the file name when restoring an element from the trash 2017-06-14 13:03:10 +02:00
yflory
5b523be171 Fix drag&drop for pads in the drive 2017-06-14 12:55:46 +02:00
yflory
e51f678bb9 Don't display the popup whne moving a file to the trash 2017-06-14 12:50:44 +02:00
yflory
497ddeee6d Upload files with drag&drop in the drive 2017-06-14 12:47:37 +02:00
ansuz
c70eb73d52 Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging 2017-06-13 11:24:20 +02:00
yflory
7dd9ed543a Merge branch 'newDrive' into staging 2017-06-12 16:08:09 +02:00
yflory
3ff3eac283 Fix a race condition causing the drive to be empty 2017-06-12 11:54:20 +02:00
yflory
a5cb5f2ceb Merge branch 'staging' into newDrive 2017-06-12 10:51:38 +02:00
yflory
1b671edce9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-12 10:50:30 +02:00
yflory
9a4a6e9b40 Always display the upgrade button in the drive 2017-06-12 10:17:52 +02:00
yflory
9cc25d4c9f Merge branch 'staging' into newDrive 2017-06-09 17:03:01 +02:00
yflory
7134b00544 Add a button to display the context menu for the trash on mobiles 2017-06-09 17:02:50 +02:00
yflory
d24458e4b0 Fix the tests to work with the async migration 2017-06-09 16:41:51 +02:00
yflory
a57f7c6ce7 Fix lint errors 2017-06-09 16:39:44 +02:00
ansuz
4bcad3e154 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-06-09 16:26:36 +02:00
yflory
9d758a040b Fix an issue with the search field not displayed properly 2017-06-09 15:45:46 +02:00
ansuz
08902c0910 drop extraneous argument 2017-06-09 15:33:28 +02:00
yflory
9ca10ba524 Merge branch 'staging' into newDrive 2017-06-09 14:40:26 +02:00
yflory
2a94bdaf05 test 2017-06-09 13:41:11 +02:00
yflory
f8c69573fd Disconnect other tabs when migrating the drive 2017-06-09 12:23:28 +02:00
yflory
b0fe04381d Merge branch 'staging' into newDrive 2017-06-08 18:14:31 +02:00
yflory
1c2ea04f11 Drive refactoring 2017-06-08 17:52:00 +02:00
ansuz
e723228060 always show upgrade button in drive 2017-06-08 14:03:01 +02:00
yflory
811d031ffd Fix the 'File' entry in the drive 'New' menu 2017-06-06 12:09:55 +02:00
yflory
5641a4a839 Add the file app in the 'new' dropdown menus 2017-06-06 11:52:47 +02:00
Caleb James DeLisle
66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place 2017-05-26 18:09:31 +02:00
yflory
df2b00122a New drive structure without file names 2017-05-24 18:59:44 +02:00
yflory
90f5713d4a Fix an issue with the search bar redirecting to incorrect location 2017-05-23 18:09:30 +02:00
yflory
538aec6ef5 Display a message when pinPads returns an error 2017-05-22 10:41:47 +02:00
yflory
56bcdff890 Add a preview of the markdown content in the code editor 2017-05-18 12:16:26 +02:00
yflory
834830fc4f Fix the Ctrl key + click to select multiple files 2017-05-16 11:26:04 +02:00
yflory
dc2cdb7c08 Add the usage bar in the settings page 2017-05-15 18:16:22 +02:00
yflory
716245f864 Make all the buttons look the same 2017-05-15 16:16:50 +02:00
yflory
0f37d9def7 Change the button font size in the toolbar 2017-05-15 14:53:51 +02:00
yflory
48496416e7 Use the same font-size for all the toolbar buttons 2017-05-15 14:46:17 +02:00
yflory
03274c3776 Display an info message in the anonymous drive 2017-05-15 13:54:03 +02:00
yflory
601226115b New anonymous drive 2017-05-12 18:06:29 +02:00
yflory
ed95bbb08f Fix lint errors 2017-05-12 16:43:01 +02:00
yflory
0f13198119 Move the parseHash code into parsePadUrl 2017-05-12 16:33:45 +02:00
yflory
733c3abefa Update the upgrade button in the drive 2017-05-11 12:43:32 +02:00
yflory
becba33b05 Scroll to the selected element in the drive 2017-05-11 12:11:45 +02:00
yflory
419fb15425 Remember the scroll position in the drive tree 2017-05-11 11:20:18 +02:00
yflory
5a21be8112 Improve UI on mobile 2017-05-10 15:54:09 +02:00
yflory
3c4b6a89d2 Fix a conflict with the arrow keys and renaming a folder in the tree 2017-05-10 14:48:15 +02:00
yflory
c00158d23a Move code to common-history 2017-05-10 13:39:14 +02:00
yflory
6a8153aca3 Fix selection issues in the drive with Chrome 2017-05-10 11:44:58 +02:00
ansuz
56a871cb67 Merge branch 'soon' into staging 2017-05-09 16:50:54 +02:00
ansuz
ae7d65c3fa fix drag to select in chrome 2017-05-09 15:11:27 +02:00
ansuz
1d4d4cffdb correct some copypasted code 2017-05-09 14:26:17 +02:00
yflory
b818fd8a37 Fix 'undefined' error with the context menu 2017-05-09 11:20:06 +02:00
yflory
c34c1cb07c Press enter to open a folder 2017-05-09 11:03:47 +02:00
yflory
1547063b7f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 18:13:31 +02:00
yflory
a20a319a7a Fix focus issues in the CryptDrive search bar 2017-05-05 18:13:14 +02:00
ansuz
36ab38f3ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:58:33 +02:00
yflory
5a883d5a57 Use the new toolbar and move the userlist code in a separate file 2017-05-05 17:56:49 +02:00
ansuz
6471b572eb correct off-by-one 2017-05-05 15:40:31 +02:00
ansuz
78b11584f8 remove unused variables 2017-05-04 16:16:09 +02:00
yflory
cd98fc6eab Increase the z-index of the select area in the drive 2017-05-03 17:18:10 +02:00
yflory
80115d0071 Fix an 'undefined' variable error in the drive 2017-05-03 17:17:42 +02:00
yflory
c9d89debba Fix lint errors 2017-05-03 16:17:52 +02:00
yflory
79365a7a82 Use the shift key to select multiple files in CryptDrive 2017-05-03 16:15:37 +02:00
yflory
3262787244 Update the icon mode in CryptDrive 2017-05-03 14:02:45 +02:00
yflory
d52e9fba43 Use the arrow keys to change the selection in the drive 2017-05-03 13:20:28 +02:00
yflory
ef89451a83 Display the storage limit in the drive 2017-05-02 17:14:53 +02:00
yflory
d2e46d1378 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-02 11:04:14 +02:00
yflory
092b98d235 Fix the offset of the drag&select feature in the drive 2017-05-02 10:41:31 +02:00
ansuz
0e7eeb285c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-29 14:24:14 +02:00
yflory
f414d480a9 Add the history mode to the CryptDrive 2017-04-28 18:23:41 +02:00
ansuz
28e4ef1b13 WIP RPC code 2017-04-28 17:11:50 +02:00
yflory
538e85c080 Fix the context menu in the drive flowing off the screen if too long 2017-04-28 16:23:01 +02:00
yflory
d9b5eb8a97 Fix an issue with the right click triggering the select area 2017-04-28 15:43:05 +02:00
ansuz
38a115d8f8 feedback on anonymous drive 2017-04-28 14:08:17 +02:00
yflory
0ef1c14d7f Fix lint errors 2017-04-28 12:12:17 +02:00
yflory
a165332c15 Don't store a pad in the drive if the limit has been reached 2017-04-28 12:08:05 +02:00
yflory
197b366712 Ability to drag&select in the drive 2017-04-27 17:01:56 +02:00
yflory
520dabe094 Remove the unsorted files category 2017-04-26 18:46:40 +02:00
ansuz
df9c312b7d make new text translateable 2017-04-18 18:31:58 +02:00
ansuz
347459781c show the size of your files, if you're logged in 2017-04-18 15:49:04 +02:00
ansuz
2a25afae5f Merge branch 'soon' into staging 2017-04-18 12:24:45 +02:00
ansuz
e0ecf651e2 add a note about showing pinned file usage 2017-04-18 12:23:58 +02:00
Caleb James DeLisle
c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 2017-04-18 12:14:32 +02:00
yflory
3ba90332bb Merge branch 'refactor' into staging 2017-04-13 14:44:55 +02:00
yflory
daabb0b3ad Integrate and fix the new fileObject (userObject) 2017-04-13 14:06:40 +02:00
ansuz
df4a250359 use feedback api instead of app= 2017-04-13 12:18:08 +02:00
yflory
c1e0316d43 Refactor fileObject 2017-04-12 18:54:22 +02:00
yflory
cfc5d634f4 Merge branch 'templates' into staging 2017-04-10 14:19:48 +02:00
yflory
bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 2017-04-10 14:19:15 +02:00
yflory
126498585e Add a context menu on the ROOT folder in the drive 2017-04-10 11:44:11 +02:00
yflory
84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +02:00
yflory
d07acc5364 Don't redraw the drive if filesData changes while in unsorted 2017-04-05 16:08:39 +02:00
ansuz
4d5baa717d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-29 11:56:13 +02:00
ansuz
9d3f859657 add a contextMenu entry for the whiteboard app 2017-03-29 11:55:24 +02:00
yflory
7ede430db3 Fix 'search.oldLocation is undefined' error 2017-03-28 14:26:41 +02:00
yflory
72fecb9549 Fix lint errors 2017-03-28 11:05:45 +02:00
yflory
af68e41fb6 Always set the focus to the search bar in the drive 2017-03-28 10:57:13 +02:00
yflory
67f4096396 Fix cursor in the drive search bar 2017-03-28 10:48:29 +02:00
yflory
71c59d7ae2 Remove unnecessary TODOs 2017-03-27 11:53:13 +02:00
yflory
a8ffac5dcd Remove old code 2017-03-27 11:30:09 +02:00
yflory
53c60a31f6 Set the properties and backup inputs to read-only in the drive 2017-03-27 11:14:37 +02:00
yflory
0c5a930cb9 Fix an issue with the 'Properties' entry not always displayed in context menu 2017-03-27 10:58:23 +02:00
ansuz
e2ee80d4e7 set icon for whiteboard app 2017-03-23 16:16:24 +01:00
yflory
819c7e3bae Fix style issue with drag&drop in the active folder 2017-03-21 14:49:02 +01:00
yflory
8ce8401107 Fix issues with middle click in context menus 2017-03-21 12:45:39 +01:00
yflory
5f4990cc80 Display or hide the context menu in a more intuitive way with multiselect 2017-03-21 12:37:45 +01:00
yflory
51033ab70a Remove useless links in the context menu and properties for readonly pads in the drive 2017-03-21 12:09:07 +01:00
yflory
7afde2309d Add properties to the files not in the trash 2017-03-21 11:34:18 +01:00
yflory
66a80ea50c Add properties for pads in the drive 2017-03-20 18:59:27 +01:00
yflory
85105a1382 Active folder in drive is not underlined anymore 2017-03-20 14:16:44 +01:00
yflory
f98c825dc3 Fix keyboard shortcuts not working in CryptDrive 2017-03-16 14:43:00 +01:00
yflory
7761aaa89f Add search UI 2017-03-16 14:16:42 +01:00
yflory
d19bbcb001 Add support for search in the drive 2017-03-15 18:59:55 +01:00
yflory
9a32fb1999 Fix sub-folders changing position in the tree when renaming them 2017-03-15 17:34:06 +01:00
yflory
931f7619c0 Keep the scroll position on redraw in drive 2017-03-15 17:30:52 +01:00
yflory
0607c3bbf3 Add a title to the 'new' button in drive 2017-03-15 17:20:08 +01:00
yflory
15e9af77bb Remove the langauge selector from toolbar and add it in settings 2017-03-15 17:14:49 +01:00
yflory
ceaf757680 Allow right click on the CryptPad logo/link in the top left corner 2017-03-13 18:49:30 +01:00
yflory
84c16c00ad Fix click events not working on inputs in the drive tree 2017-03-13 15:53:13 +01:00
yflory
459b18c97b Add the loading screen in the HTML so that it is displayed before JS is loaded 2017-03-08 18:05:15 +01:00
yflory
f62267f8a1 Ability to import local pads in the user object 2017-03-07 18:39:21 +01:00
yflory
ce6cd1211e Fix lint errors 2017-03-07 15:33:08 +01:00
yflory
14938089ac Keep the focus on the iframe window after canceling a deletion 2017-03-07 14:24:06 +01:00
yflory
3f7dea8f7e Context menu support for multi-select options in drive 2017-03-07 12:22:02 +01:00
yflory
e1c02fd8a4 Drive rename: save pads and folders name on click, cancel with Esc. 2017-03-06 18:15:14 +01:00
Pierre Bondoerffer
6c9da646e0
(CSS) Some improvements to drive 2017-03-03 16:26:08 +01:00
yflory
a978b51656 If display name is empty, use anonymous in the drive 2017-03-03 12:06:35 +01:00
yflory
153386a6e0 CSS improvements in the drive tree 2017-03-02 18:24:18 +01:00
yflory
6098f28260 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-03-02 18:16:20 +01:00
yflory
a852112808 Fix open folder from the tree context menu 2017-03-02 18:16:16 +01:00
Pierre Bondoerffer
800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-02 17:44:29 +01:00
Pierre Bondoerffer
e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-02 17:09:39 +01:00
ansuz
01c4d7d4a7 Merge branch 'maybe' into staging 2017-03-02 17:09:06 +01:00
Pierre Bondoerffer
e0d972674f
Fix context menu in drive and rename textbox styling 2017-03-02 16:22:32 +01:00
yflory
8bdc8415ab Find a pad in the drive 2017-03-02 10:15:13 +01:00
Caleb James DeLisle
91eda5fa83 Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
2017-03-01 21:06:53 +01:00
ansuz
7db0e14bc0 add 'force' flag to override removal of html elements 2017-03-01 17:05:57 +01:00
yflory
53f4f8826e Merge branch 'staging' into staging 2017-03-01 16:32:18 +01:00
yflory
55210f17eb Clean the code to be less dependant on 'li' 2017-03-01 16:15:48 +01:00
Pierre Bondoerffer
3e9c4d0901
Add hover to file manager tree 2017-03-01 15:57:22 +01:00
Pierre Bondoerffer
cbdfae09a6
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-01 15:53:48 +01:00
yflory
c6c3e1bbb5 Don't select subfolders in the tree when drag&drop 2017-03-01 15:53:31 +01:00
Pierre Bondoerffer
d605fc757b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-01 15:46:49 +01:00
yflory
a26b9d3240 Don't select subfolders in the tree when right-click on drag&drop 2017-03-01 15:46:10 +01:00
Pierre Bondoerffer
b0323f6fd9
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 2017-03-01 14:45:18 +01:00
yflory
a2b5200381 Add a container for the folders in the tree in the drive 2017-03-01 14:44:43 +01:00
yflory
11d54256da Make sure the display name is displayed in the same way everywhere 2017-03-01 13:10:06 +01:00
Pierre Bondoerffer
eb9a39eb68
Add hover on elements in drive and make grid slightly prettier 2017-02-28 23:15:47 +01:00
yflory
f06196c261 Remove the context menu buttons when removing selection 2017-02-28 15:48:49 +01:00
yflory
efb7380a12 Fix default pad not created after registration 2017-02-28 13:12:27 +01:00