524 Commits (1bb47e28efa041cbcb9adb9fc19dbd21e0d63c63)

Author SHA1 Message Date
Caleb James DeLisle 840cd91bcb manual merge 7 years ago
Caleb James DeLisle 75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad 7 years ago
yflory 101482b8cc Migrate settings to use a sandboxed iframe 7 years ago
ansuz 867df1db56 fix '+New' button in drive toolbar 7 years ago
yflory 6f020b67ca Add thumbnails to framework apps 7 years ago
yflory 2dd3c42fd5 Fix handlers registered again on reconnect in drive and poll 7 years ago
yflory 094856a511 Fix renaming pad with multiple dots in the name in drive 7 years ago
yflory 88e7f9a218 Add last access and creation times in the properties window in drive 7 years ago
yflory 22e3baed4b Fix sort issues in drive 7 years ago
yflory 4197b7b968 Fix missing icon in list mode for files with thumbnail 7 years ago
yflory 4116d08dd1 Display thumbnails in the drive and then file picker 7 years ago
yflory 7b6432f134 Lint 7 years ago
yflory b86f8e3f26 Fix uloaded files not moved to the correct folder in drive 7 years ago
yflory 620ba4ed5d Fix fouc in drive 7 years ago
yflory e5a54b5978 Fix folder highlighting with drag&drop in the drive 7 years ago
yflory 1c7c37c121 Add the file class to pads in 'template' and 'recent' categories in the drive 7 years ago
yflory ab3648a30a Merge branch 'newpoll' into staging 7 years ago
ansuz 7559bc062e lint compliance 7 years ago
ansuz d85db64939 add tags from drive 7 years ago
ansuz c936e5ae73 make context menu open correct app on correct port 7 years ago
ansuz deed04108b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 7 years ago
ansuz a90c078e84 correct reference to undefined 7 years ago
yflory ceb8ff18bd Fix ghost icon in drive 7 years ago
ansuz 0f9e93e1de make tests pass again 7 years ago
yflory 66da349ee4 Sandboxed Poll app with less2 7 years ago
yflory 8de1852ab9 Lint compliance 7 years ago
yflory e02a779c14 Use secure drive as default drive 7 years ago
yflory b4de31c827 Merge branch 'newdrive' into staging 7 years ago
ansuz 52be5501d6 remove invalid test 7 years ago
yflory 1afbd4648d Fix old drive 7 years ago
yflory 8a09e39f46 Enable tags in pads 7 years ago
yflory a78b597ebb lint errors 7 years ago
yflory 8ce364a252 Add a button to empty the trash in the drive 7 years ago
yflory a1e7bf701d Select the element after clicking 'show in folder' in the drive search 7 years ago
yflory c00d295466 Add missing translations 7 years ago
Caleb James DeLisle 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter 7 years ago
yflory 0f9da69185 Show if a pad has been renamed in the drive 7 years ago
yflory 8ef27dca08 Lint 7 years ago
yflory 1aef844fc3 Fix title attribute for truncated titles in the drive 7 years ago
yflory 51f1be9f7a Improve the input style when renaming a folder in the drive tree 7 years ago
yflory 403b62f131 Fix ghost icon modal and improve UI on mobile 7 years ago
yflory 5bf966633c Merge branch 'staging' into slide2 7 years ago
yflory 05793c220c Fix secure iframes on Edge 7 years ago
ansuz bbf7ed3827 refactor drive to use dialog.selectable()
fix class on alertify-like boxes
7 years ago
yflory 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 7 years ago
yflory 305feebbbe Fix scroll position when refreshing the drive tree 7 years ago
yflory 86e23ac19f Use less2 in secure iframes 7 years ago
yflory dec870d2bd Fix selection in the drive search results 7 years ago
yflory 4bceef8952 Fix the upload status table missing in the drive 7 years ago
yflory 6c65e5ff72 Fix the ghost icon in the drive and add missing text 7 years ago
Caleb James DeLisle acfaaa7d56 jshint compliance 7 years ago
yflory d6c33fdf4f Ghost icon to add a pad 7 years ago
yflory 98daf10ed1 Ability to collapse the root directory in the drive 7 years ago
yflory b4864b96ac Add a recent pads category in the drive 7 years ago
Caleb James DeLisle b081603455 Update requirejs 7 years ago
yflory e2d39de143 Forget button in pad2 7 years ago
Pierre Bondoerffer 82fadde249
restyle info-box in drive 7 years ago
Pierre Bondoerffer 2cc6c636db
Add some missing titles 7 years ago
Pierre Bondoerffer 8f285eba9f
make file picker ui even prettier 7 years ago
yflory a80b00a765 Move the file picker in common 7 years ago
yflory c33d2a2db0 New tooltips 7 years ago
yflory baf439648e Add the contacts app in the dropdown menu 7 years ago
yflory b3e225cb3b Replace spinner by text and fix mobile UI 7 years ago
yflory ce50dbf3ca Hide the 'templates' list header if the category is empty 7 years ago
yflory 42075e4b5f Make everything 16px and 32px 7 years ago
yflory 16d0527e92 Add a page title in drive, settings and file 7 years ago
yflory a0b14faf89 Fix the font in settings and drive 7 years ago
yflory 112c4c85e5 Left menu in drive 7 years ago
yflory 125018c8c3 New settings page 7 years ago
yflory c02fa39524 Make drive search bar blue 7 years ago
ansuz 086e5909dd Merge branch 'soon' into staging 7 years ago
ansuz f9a43d6570 select everything before file extensions in drive when renaming 7 years ago
yflory de420de021 Fix the folder's path in the search results page 7 years ago
yflory 43ac71603c Move pad attributes in pad data 7 years ago
yflory ffd184d50e Fix overflowing names in the new userlist 8 years ago
yflory 1df5e6e855 Fix toolbar buttons for Safari 8 years ago
yflory 568ce70afd Add a spinner for the history and update history buttons 8 years ago
yflory b9320e6005 Toolbar improvements 8 years ago
yflory 8abc94d37b Replace folder images in the drive 8 years ago
yflory 8279ef3130 Fix conflict between ckeditor toolbar and userlist on small screens 8 years ago
yflory 7a87775372 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 56a25e1036 Small fixes for the new toolbar 8 years ago
ansuz 39149a052b add new feedback keys 8 years ago
ansuz 7a5c5ce0a3 load scripts asynchronously 8 years ago
ansuz fca1ef4d36 hide unstyled content until the loading screen is displayed 8 years ago
ansuz 7de2683169 make all apps use clientside templates 8 years ago
ansuz e9bfaa9a60 compile less clientside. remove compiled css 8 years ago
yflory 36ef4178dc Remove the editable title from the file app 8 years ago
yflory ce44a8d351 Fix the backup button in anonymous drive 8 years ago
yflory 06a0590f73 New folder icons 8 years ago
yflory 503e9de07c Lint errors 8 years ago
yflory b7a0547b77 New toolbar colors 8 years ago
yflory 3052ec8abb Merge branch 'newCk' into staging 8 years ago
yflory c3f636851a Fix path size width in drive 8 years ago
yflory fb388f2610 Fix an issue with invalid drive before migration 8 years ago
yflory 59fb5bd8be One toolbar color per app 8 years ago
yflory 1ad1b78c64 Fix the history mode with readOnly and old URLs 8 years ago
yflory f1aef66fc9 Fix the drive history 8 years ago
yflory 008c417111 Context menu was not hidden after a click in the drive 8 years ago
yflory 377a90961b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory e40f43bd20 Migrated pads were not displayed instantly in the drive 8 years ago
ansuz 44b8bc7b7d make context menus unselectable 8 years ago
yflory 1e9bc89855 Fix drive icons when the name contains a long word 8 years ago
yflory 66b076111e Add an upload button to the slide's file picker 8 years ago
yflory a4f45caebb Lint 8 years ago
yflory 8738b42861 Update the drive UI to show that Upload and New are linked to a folder 8 years ago
yflory a98353af6c Add a button to upload a file in the drive 8 years ago
yflory 7e0a2abc2c Fix the file name when restoring an element from the trash 8 years ago
yflory 5b523be171 Fix drag&drop for pads in the drive 8 years ago
yflory e51f678bb9 Don't display the popup whne moving a file to the trash 8 years ago
yflory 497ddeee6d Upload files with drag&drop in the drive 8 years ago
ansuz c70eb73d52 Merge branch 'master' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 7dd9ed543a Merge branch 'newDrive' into staging 8 years ago
yflory 3ff3eac283 Fix a race condition causing the drive to be empty 8 years ago
yflory a5cb5f2ceb Merge branch 'staging' into newDrive 8 years ago
yflory 1b671edce9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 9a4a6e9b40 Always display the upgrade button in the drive 8 years ago
yflory 9cc25d4c9f Merge branch 'staging' into newDrive 8 years ago
yflory 7134b00544 Add a button to display the context menu for the trash on mobiles 8 years ago
yflory d24458e4b0 Fix the tests to work with the async migration 8 years ago
yflory a57f7c6ce7 Fix lint errors 8 years ago
ansuz 4bcad3e154 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 9d758a040b Fix an issue with the search field not displayed properly 8 years ago
ansuz 08902c0910 drop extraneous argument 8 years ago
yflory 9ca10ba524 Merge branch 'staging' into newDrive 8 years ago
yflory 2a94bdaf05 test 8 years ago
yflory f8c69573fd Disconnect other tabs when migrating the drive 8 years ago
yflory b0fe04381d Merge branch 'staging' into newDrive 8 years ago
yflory 1c2ea04f11 Drive refactoring 8 years ago
ansuz e723228060 always show upgrade button in drive 8 years ago
yflory 811d031ffd Fix the 'File' entry in the drive 'New' menu 8 years ago
yflory 5641a4a839 Add the file app in the 'new' dropdown menus 8 years ago
Caleb James DeLisle 66520b6041 cleaned up the accounts, limits and revenue sharing and unified the config in one place 8 years ago
yflory df2b00122a New drive structure without file names 8 years ago
yflory 90f5713d4a Fix an issue with the search bar redirecting to incorrect location 8 years ago
yflory 538aec6ef5 Display a message when pinPads returns an error 8 years ago
yflory 56bcdff890 Add a preview of the markdown content in the code editor 8 years ago
yflory 834830fc4f Fix the Ctrl key + click to select multiple files 8 years ago
yflory dc2cdb7c08 Add the usage bar in the settings page 8 years ago
yflory 716245f864 Make all the buttons look the same 8 years ago
yflory 0f37d9def7 Change the button font size in the toolbar 8 years ago
yflory 48496416e7 Use the same font-size for all the toolbar buttons 8 years ago
yflory 03274c3776 Display an info message in the anonymous drive 8 years ago
yflory 601226115b New anonymous drive 8 years ago
yflory ed95bbb08f Fix lint errors 8 years ago
yflory 0f13198119 Move the parseHash code into parsePadUrl 8 years ago
yflory 733c3abefa Update the upgrade button in the drive 8 years ago
yflory becba33b05 Scroll to the selected element in the drive 8 years ago
yflory 419fb15425 Remember the scroll position in the drive tree 8 years ago
yflory 5a21be8112 Improve UI on mobile 8 years ago
yflory 3c4b6a89d2 Fix a conflict with the arrow keys and renaming a folder in the tree 8 years ago
yflory c00158d23a Move code to common-history 8 years ago
yflory 6a8153aca3 Fix selection issues in the drive with Chrome 8 years ago
ansuz 56a871cb67 Merge branch 'soon' into staging 8 years ago
ansuz ae7d65c3fa fix drag to select in chrome 8 years ago
ansuz 1d4d4cffdb correct some copypasted code 8 years ago
yflory b818fd8a37 Fix 'undefined' error with the context menu 8 years ago
yflory c34c1cb07c Press enter to open a folder 8 years ago
yflory 1547063b7f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a20a319a7a Fix focus issues in the CryptDrive search bar 8 years ago
ansuz 36ab38f3ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 5a883d5a57 Use the new toolbar and move the userlist code in a separate file 8 years ago
ansuz 6471b572eb correct off-by-one 8 years ago
ansuz 78b11584f8 remove unused variables 8 years ago
yflory cd98fc6eab Increase the z-index of the select area in the drive 8 years ago
yflory 80115d0071 Fix an 'undefined' variable error in the drive 8 years ago
yflory c9d89debba Fix lint errors 8 years ago
yflory 79365a7a82 Use the shift key to select multiple files in CryptDrive 8 years ago
yflory 3262787244 Update the icon mode in CryptDrive 8 years ago
yflory d52e9fba43 Use the arrow keys to change the selection in the drive 8 years ago
yflory ef89451a83 Display the storage limit in the drive 8 years ago
yflory d2e46d1378 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 092b98d235 Fix the offset of the drag&select feature in the drive 8 years ago
ansuz 0e7eeb285c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory f414d480a9 Add the history mode to the CryptDrive 8 years ago
ansuz 28e4ef1b13 WIP RPC code 8 years ago
yflory 538e85c080 Fix the context menu in the drive flowing off the screen if too long 8 years ago
yflory d9b5eb8a97 Fix an issue with the right click triggering the select area 8 years ago
ansuz 38a115d8f8 feedback on anonymous drive 8 years ago
yflory 0ef1c14d7f Fix lint errors 8 years ago
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 8 years ago
yflory 197b366712 Ability to drag&select in the drive 8 years ago
yflory 520dabe094 Remove the unsorted files category 8 years ago
ansuz df9c312b7d make new text translateable 8 years ago
ansuz 347459781c show the size of your files, if you're logged in 8 years ago
ansuz 2a25afae5f Merge branch 'soon' into staging 8 years ago
ansuz e0ecf651e2 add a note about showing pinned file usage 8 years ago
Caleb James DeLisle c341fa8e94 Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter 8 years ago
yflory 3ba90332bb Merge branch 'refactor' into staging 8 years ago
yflory daabb0b3ad Integrate and fix the new fileObject (userObject) 8 years ago
ansuz df4a250359 use feedback api instead of app= 8 years ago
yflory c1e0316d43 Refactor fileObject 8 years ago
yflory cfc5d634f4 Merge branch 'templates' into staging 8 years ago
yflory bd16e0f0e7 Templates in polls and canvas, and ability to disable templates 8 years ago
yflory 126498585e Add a context menu on the ROOT folder in the drive 8 years ago
yflory 84d8615cf1 Save and use templates in pad, code and slides 8 years ago
yflory d07acc5364 Don't redraw the drive if filesData changes while in unsorted 8 years ago
ansuz 4d5baa717d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 9d3f859657 add a contextMenu entry for the whiteboard app 8 years ago
yflory 7ede430db3 Fix 'search.oldLocation is undefined' error 8 years ago
yflory 72fecb9549 Fix lint errors 8 years ago
yflory af68e41fb6 Always set the focus to the search bar in the drive 8 years ago
yflory 67f4096396 Fix cursor in the drive search bar 8 years ago
yflory 71c59d7ae2 Remove unnecessary TODOs 8 years ago
yflory a8ffac5dcd Remove old code 8 years ago
yflory 53c60a31f6 Set the properties and backup inputs to read-only in the drive 8 years ago
yflory 0c5a930cb9 Fix an issue with the 'Properties' entry not always displayed in context menu 8 years ago
ansuz e2ee80d4e7 set icon for whiteboard app 8 years ago
yflory 819c7e3bae Fix style issue with drag&drop in the active folder 8 years ago
yflory 8ce8401107 Fix issues with middle click in context menus 8 years ago
yflory 5f4990cc80 Display or hide the context menu in a more intuitive way with multiselect 8 years ago
yflory 51033ab70a Remove useless links in the context menu and properties for readonly pads in the drive 8 years ago
yflory 7afde2309d Add properties to the files not in the trash 8 years ago
yflory 66a80ea50c Add properties for pads in the drive 8 years ago
yflory 85105a1382 Active folder in drive is not underlined anymore 8 years ago
yflory f98c825dc3 Fix keyboard shortcuts not working in CryptDrive 8 years ago
yflory 7761aaa89f Add search UI 8 years ago
yflory d19bbcb001 Add support for search in the drive 8 years ago
yflory 9a32fb1999 Fix sub-folders changing position in the tree when renaming them 8 years ago
yflory 931f7619c0 Keep the scroll position on redraw in drive 8 years ago
yflory 0607c3bbf3 Add a title to the 'new' button in drive 8 years ago
yflory 15e9af77bb Remove the langauge selector from toolbar and add it in settings 8 years ago
yflory ceaf757680 Allow right click on the CryptPad logo/link in the top left corner 8 years ago
yflory 84c16c00ad Fix click events not working on inputs in the drive tree 8 years ago
yflory 459b18c97b Add the loading screen in the HTML so that it is displayed before JS is loaded 8 years ago
yflory f62267f8a1 Ability to import local pads in the user object 8 years ago
yflory ce6cd1211e Fix lint errors 8 years ago
yflory 14938089ac Keep the focus on the iframe window after canceling a deletion 8 years ago
yflory 3f7dea8f7e Context menu support for multi-select options in drive 8 years ago
yflory e1c02fd8a4 Drive rename: save pads and folders name on click, cancel with Esc. 8 years ago
Pierre Bondoerffer 6c9da646e0
(CSS) Some improvements to drive 8 years ago
yflory a978b51656 If display name is empty, use anonymous in the drive 8 years ago
yflory 153386a6e0 CSS improvements in the drive tree 8 years ago
yflory 6098f28260 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a852112808 Fix open folder from the tree context menu 8 years ago
Pierre Bondoerffer 800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago
Pierre Bondoerffer e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago
ansuz 01c4d7d4a7 Merge branch 'maybe' into staging 8 years ago
Pierre Bondoerffer e0d972674f
Fix context menu in drive and rename textbox styling 8 years ago
yflory 8bdc8415ab Find a pad in the drive 8 years ago
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.
8 years ago
ansuz 7db0e14bc0 add 'force' flag to override removal of html elements 8 years ago
yflory 53f4f8826e Merge branch 'staging' into staging 8 years ago
yflory 55210f17eb Clean the code to be less dependant on 'li' 8 years ago
Pierre Bondoerffer 3e9c4d0901
Add hover to file manager tree 8 years ago
Pierre Bondoerffer cbdfae09a6
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago
yflory c6c3e1bbb5 Don't select subfolders in the tree when drag&drop 8 years ago
Pierre Bondoerffer d605fc757b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago
yflory a26b9d3240 Don't select subfolders in the tree when right-click on drag&drop 8 years ago
Pierre Bondoerffer b0323f6fd9
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging 8 years ago