2061 Commits (ac8da0d52d9c643c58a8b7060ed5435f96e146e9)

Author SHA1 Message Date
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
ansuz 47857ec382 use cached pinned usage data 8 years ago
yflory 75c3c10b20 Merge branch 'soon' into staging 8 years ago
yflory c1402fbb0a Lint error 8 years ago
yflory b36484931d Lint 8 years ago
yflory 1fb638f519 clean the code 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
ansuz 23318357a6 make fewer RPC calls for usageBar 8 years ago
ansuz df586a223c update limits, usage, plan, and note whenever they are checked 8 years ago
ansuz 8bad0c556e change log to error 8 years ago
ansuz b0e00d337e more careful validation 8 years ago
yflory fd88162624 Merge branch 'staging' into newDrive 8 years ago
yflory 7c9e86e351 Merge branch 'soon' into staging 8 years ago
yflory 9694272083 Fix html code not parsed 8 years ago
yflory 9ca10ba524 Merge branch 'staging' into newDrive 8 years ago
yflory 7f120c8fc1 Merge branch 'soon' into staging 8 years ago
yflory 78e6118153 Merge branch 'staging' into newDrive 8 years ago
yflory 444c41974e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory df5cbfb53e Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 8 years ago
yflory 6a96aa6819 Disconnect the network when migrating the drive in another tab 8 years ago
yflory 2a94bdaf05 test 8 years ago
yflory ca95b5c42b Remove unused console.log 8 years ago
yflory f8c69573fd Disconnect other tabs when migrating the drive 8 years ago
ansuz c4e5741ae0 update upgrade button logic 8 years ago
ansuz f1a9002417 use upgradeURL with usage bar 8 years ago
yflory 51e0d40572 Make sure the old storage key is removed after migration 8 years ago
yflory b0fe04381d Merge branch 'staging' into newDrive 8 years ago
ansuz fe2fef5e4c support dragging and dropping multiple files 8 years ago
yflory 1c2ea04f11 Drive refactoring 8 years ago
ansuz fe42f5e88c ask for new cookies and resend commands on NO_COOKIE errors 8 years ago
ansuz e723228060 always show upgrade button in drive 8 years ago
ansuz da533b106a improve type checking in getFileSize 8 years ago
ansuz 2f851ab97e fix lint errors 8 years ago
ansuz d25477e8c6 don't let tooltips interfere with DOM interaction 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
yflory ac91d2f413 Fix the upgrade and donate buttons in the home page 8 years ago
yflory ee57458158 Remove the pin limit alert 8 years ago
ansuz f43132a63b bump version in footer and package.json 8 years ago
ansuz ec9a4dec5e Merge branch 'soon' into staging 8 years ago
ansuz 77d4ffba86 animate preview mode sidebar 8 years ago
ansuz 65233c2464 remove unused variable 8 years ago
ansuz 767793b5ca fix stuck loading tip 8 years ago
ansuz 8f7aaecc1c cache some selectors and decrease memory demands 8 years ago
ansuz f631973f1f optimize file upload 8 years ago
ansuz 55af84cc90 lower spinner timeout interval 8 years ago
ansuz c65ca5cfc6 restore deleted line and add missing semicolon 8 years ago
ansuz 8bd9ad8847 add automated registration test 8 years ago
ansuz 07279c8dc7 export boolean Test.testing 8 years ago
Caleb James DeLisle c8bd1bb2ac Trying to improve the tests which fail always when running remotely 8 years ago
Caleb James DeLisle 71bd808e4f Send everything through the test global function 8 years ago
Caleb James DeLisle 244bd7b378 ;;; 8 years ago
Caleb James DeLisle 7d557df74b a new and more horrible way of sniffing the logs out of the instance 8 years ago
Caleb James DeLisle 0d4b74cfba ;;;;;; keep these ;;; for later ;;;;; 8 years ago
Caleb James DeLisle 24f37ea414 Delicious testing 8 years ago
ansuz 5e57578fa9 Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
ansuz 30f66ab7ba hotfix 'undefined/' bug 8 years ago
ansuz 7b94106bac fix inverted conditional :/ 8 years ago
ansuz 2e03485db4 remove known bad entries from localStorage.userHash... 8 years ago
ansuz 936bf8df9d return falsey if userHash is junk 8 years ago
ansuz 105e5cdac9 fix 'undefined/' userHash 8 years ago
ansuz 401e908963 use media-tag with xhr error handling 8 years ago
ansuz 3465710237 Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag 8 years ago
Daniel RADEAU 8ab9248a78 Fix ES6 8 years ago
Daniel RADEAU 21c39572be Update media-tag and fix bower dependencies 8 years ago
ansuz daf112a5b5 take api settings into account for upgrade button 8 years ago
ansuz ebfa228bc0 add upgrade button to all static pages 8 years ago
ansuz 149568689a color donate button green 8 years ago
ansuz ec6ad6772b send feedback on donation 8 years ago
Daniel RADEAU cb2efe138b Media Tag integration, image, audio, video, pdf 8 years ago
ansuz 76c530037b enable donate button in all apps 8 years ago
ansuz 9ca5bc507e add support for donate button 8 years ago
ansuz a70014dd11 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 99a44f119f don't send referrer headers on pads which may link outward 8 years ago
ansuz 92a7970eb8 fix merge conflicts 8 years ago
ansuz 1240b864ef fix misconfigured history 8 years ago
Pierre Bondoerffer f434f002c4
poll: make locks clickable 8 years ago
ansuz 3915b30055 provide a register button on login
also direct users from file to login
8 years ago
Pierre Bondoerffer b6bb576a34
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll 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
Pierre Bondoerffer 1092285a68
merge master 8 years ago
Caleb James DeLisle 6c1861dbc6 Merge branch 'soon' into staging 8 years ago
Caleb James DeLisle 2ecf257fcd Sync localStorage with sessionStorage in auth because safari... 8 years ago
ansuz 3f3d64992d resolve merge conflicts 8 years ago
ansuz 57017c68fa hacks for cross-domain safari 8 years ago
ansuz cf658c1b3a backport live changes 8 years ago
ansuz a04f179d8b hide preview mode on phones 8 years ago
yflory df2b00122a New drive structure without file names 8 years ago
ansuz dc2b0ae6b4 jshint compliance 8 years ago
ansuz b32c329269 remember whether you were using preview mode for a pad 8 years ago
ansuz d9f7470f06 copy user details into sessionStorage for safari 8 years ago
ansuz a5ffd278a7 write styles for code in .less 8 years ago
ansuz 3803f6a20f only render preview if preview container is visible 8 years ago
ansuz 617e027f12 catch markdown preview errors 8 years ago
ansuz c5bb830757 don't preview if hightlight mode is not markdown 8 years ago
ansuz fd83ae3e61 implement createRandomInteger 8 years ago
ansuz 4d9060f49e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 378bf2aa94 yflory's word wrap fix 8 years ago
ansuz dc80b6b11f throttle markdown preview 8 years ago
yflory f5f8e148ca Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 90f5713d4a Fix an issue with the search bar redirecting to incorrect location 8 years ago
ansuz 97cc4a6d54 add styling for tables in markdown preview 8 years ago
ansuz e6c04ccb49 bump server after paying for an account 8 years ago
ansuz 6faca87e73 set preview content in read only mode 8 years ago
ansuz 6324d9bbb0 feedback on template feature usage 8 years ago
yflory c3437382fb Fix the release version in the what's new popup 8 years ago
ansuz 4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 70cae0d2c3 safely access pin reset response 8 years ago
yflory a50805545d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d55b7e411c Display an alert in the drive when the limit is reached 8 years ago
ansuz dac9d0647d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 259d34b7c8 jshint compliance 8 years ago
yflory 40b99e7bbf Get the file name before downloading the entire file 8 years ago
ansuz 6dc3c62ba4 check for src before trying to ajax 8 years ago
ansuz a6cf761172 don't store media tag pages in the drive 8 years ago
yflory 90a9764fa4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 346c289204 Fix lint errors 8 years ago
ansuz 71dc0af6c7 better test for success error codes 8 years ago
ansuz 0b6c587e2b fetch and decrypt metadata with range requests 8 years ago
yflory eb31d0323c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a99080fb74 push the rest of the code 8 years ago
yflory 408a4dad94 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 3964f4feee Display the progress when downloading a file 8 years ago
ansuz dd73ad2dd5 add decryptMetadata function 8 years ago
ansuz 5179252d3b fix merge conflicts 8 years ago
ansuz 4ee42b87d4 make file crypto great again 8 years ago
yflory c45f08f147 Use a download button instead of downloading a file automatically 8 years ago
yflory 0c2f84058b Improve css for the file app 8 years ago
yflory 9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 538aec6ef5 Display a message when pinPads returns an error 8 years ago
ansuz 03da870a7a jshint compliance 8 years ago
ansuz af4fd3c6d3 resolve merge conflicts 8 years ago
yflory 67a04a16ec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 1ab6eb3c5d Add a queue for multiple uploads in the file app 8 years ago
ansuz ba5ef5157e show pretty representations of storage usage 8 years ago
ansuz 0a54f0cf2d better alignment of preview and code entry 8 years ago
ansuz e78299aed6 use async file decryption, listen for progress events. 8 years ago
ansuz bcd0303821 style /file/ with .less 8 years ago
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 310909dc9e handle new error codes 8 years ago
yflory d014fccfce Fix lint error 8 years ago
yflory 2082b328b4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 814c81fb13 Display an alert when CryptPad has a new version 8 years ago
ansuz 34606ea8ba use newest xwiki media-tag 8 years ago
ansuz 5a83259233 listen for decryption errors 8 years ago
ansuz 2cee9534c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz d324a054f2 add progress bar to file upload 8 years ago
yflory 21f9e31e75 Add a placeholder for the user app 8 years ago
ansuz 164342920e fix inverted condition 8 years ago
yflory 620f4dc512 Add translations for the markdown preview button title 8 years ago
yflory 51bd41d4e8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 0bd4caeb7e Add the task list code to the markdown renderer 8 years ago
ansuz d187945e94 jshint compliance 8 years ago
ansuz 3ba94a1ba2 correctly set release version number 8 years ago
yflory 2b60b81a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d13dde856a Add the markdown renderer file and change code's default content 8 years ago
ansuz 4debec39bb update footer with next release codename and corrected matrix link 8 years ago
ansuz 73ec91aa5e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 80479fdc90 use rpc calls from cryptpad common 8 years ago
ansuz 7befaccd88 move more rpc calls into pinpad 8 years ago
yflory 56bcdff890 Add a preview of the markdown content in the code editor 8 years ago
yflory b72415b56b Fix old hashes not working with the new parser 8 years ago
yflory 6b7aeb9121 Fix the text example 8 years ago
yflory fe0f21594a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 953e7155f0 Send only the hostname to the accounts server 8 years ago
ansuz afef456b18 fix undefined reference 8 years ago
ansuz 8fe0282b7b jshint compliance 8 years ago
ansuz 827233dcba new translation keys for file upload 8 years ago
yflory 834830fc4f Fix the Ctrl key + click to select multiple files 8 years ago
yflory 1a7c4d5ebe Store the FS_hash in the user object after the merge 8 years ago
yflory 87fa28180a Display an upgrade button in the settings page 8 years ago
yflory c1b43db363 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 7ee6864ea4 Add the user menu in the login and register pages 8 years ago
ansuz 1542aa96bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory dc2cdb7c08 Add the usage bar in the settings page 8 years ago
ansuz cc893723de add some TODOs, log uploaded content so we know it's working 8 years ago
ansuz 2dd04f7631 get limits from the server 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 8172f117a7 Fix Hash.alert not a function 8 years ago
yflory 0e58859393 Fix lint error 8 years ago
yflory 771348720b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 03274c3776 Display an info message in the anonymous drive 8 years ago
yflory 57979f6314 Display the public key using a href in the settings page 8 years ago
ansuz a9b670fdf5 don't parse trailing slash as part of encryption key in old hashes 8 years ago
ansuz 9bbd3161ca update tests for new API changes 8 years ago
ansuz 06f3d0eefe shim isArray if not exists. correctly report how often this occurs 8 years ago
yflory 50d9f72b3a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 601226115b New anonymous drive 8 years ago
ansuz 30f6ef3f85 handle more response codes, use metadata 8 years ago
ansuz 18d959ef16 handle non-200 status codes 8 years ago
yflory ed95bbb08f Fix lint errors 8 years ago
yflory 89a993be3c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 0f13198119 Move the parseHash code into parsePadUrl 8 years ago
ansuz 4c4c21342d don't try to decrypt nothing 8 years ago
ansuz 69e933dd17 better error handling in file download 8 years ago
ansuz 42f3a62cac handle errors with XHR 8 years ago
ansuz 213708d8dc center media tags 8 years ago
ansuz 6c68b5e6ca use new media-tag, listen for decryption events 8 years ago
ansuz 7dd5907ff0 Merge branch 'limit' into staging 8 years ago
ansuz 22efde87d5 correctly estimate upload size 8 years ago
ansuz a993ab6616 use new encrypted file encoding in media-tag 8 years ago
ansuz 8c49150725 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory e0293a1162 Merge branch 'master' into staging 8 years ago
yflory 57ee7de7d4 Update and return the storage limit 8 years ago
yflory d3854b9774 Fix selection issues in the drive with Chrome 8 years ago
yflory 371edff943 Fix an error when moving unsorted files to root in the drive 8 years ago
yflory b76dcba1d6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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 5d0535966c Center vertically slides in present mode and checkbox to disable transitions 8 years ago
ansuz 5d37a50a87 try to estimate upload size 8 years ago
ansuz 6d30d7f89f strip junk bytes from base64 more safely 8 years ago
ansuz 1525712deb new encrypted file format 8 years ago
ansuz 8f5989b6b0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory cf81b02096 Make sure the spinner is always centered in the loading screen 8 years ago
yflory 5a21be8112 Improve UI on mobile 8 years ago
ansuz 5aba2d4640 remove unused variable 8 years ago
yflory 5c8586f8a3 Fix typo in file upload 8 years ago
yflory 1e4fc5a979 lint 8 years ago
yflory 3c4b6a89d2 Fix a conflict with the arrow keys and renaming a folder in the tree 8 years ago
yflory 96ccb94397 Add the share button when a file upload is complete 8 years ago
yflory c00158d23a Move code to common-history 8 years ago
ansuz 97a28d3938 test file encryption/decryption 8 years ago
ansuz 6a1c799a6e support async tests 8 years ago
ansuz 922e7803e9 remove extraneous slashes from hashes when parsing 8 years ago
yflory 0f8ef2f516 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 6a8153aca3 Fix selection issues in the drive with Chrome 8 years ago
yflory a6c49cd65c Fix undefined title in slides present mode 8 years ago
ansuz 299a53ded7 prefer to use functions from common 8 years ago
ansuz a338b23f40 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz df47b913e3 fetch array buffers in cryptpad-common 8 years ago
yflory ff16084719 Fix lint errors 8 years ago
yflory 50c8a859e6 Move the CodeMirror cursor code to common-codemirror 8 years ago
yflory 9eb8e55cf6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files 8 years ago
ansuz 56a871cb67 Merge branch 'soon' into staging 8 years ago
ansuz 521f99a3d6 support drag and drop for file upload 8 years ago
ansuz b4973b7610 Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
ansuz ae7d65c3fa fix drag to select in chrome 8 years ago
yflory 63710e1ccc Move the code related to the title in another file 8 years ago
yflory 48898c97e5 Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
yflory ce5cdce917 Fix an issue where the username was lost on websocket reconnect 8 years ago
ansuz 1d4d4cffdb correct some copypasted code 8 years ago
ansuz 2b4f503aff Merge branch 'master' of github.com:xwiki-labs/cryptpad 8 years ago
ansuz 4a104052b4 handle errors in file 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
ansuz 7da01d0862 unlist removed examples 8 years ago
ansuz ea3dc8a852 remove file upload test 8 years ago
ansuz 42dcfb9661 unceremoniously kick web clients when you 'log out everywhere' 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 9206d89531 Fix lint errors 8 years ago
yflory bbc08bbcfd 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
yflory 6847906ac9 Move the userlist code in a separate file 8 years ago
ansuz 6471b572eb correct off-by-one 8 years ago
ansuz 3a338e0890 fix undefined reference 8 years ago
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings 8 years ago
yflory 5a5b02b82b Don't store in the drive pads without a hash 8 years ago
ansuz c07d3e6162 update version strings for upcoming release 8 years ago
ansuz 3e118c6a38 allow instance-wide custom salt for login 8 years ago
ansuz 6a00d11a15 fix undefined reference 8 years ago
ansuz c3d1554e8c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 660cda6573 set title when uploading 8 years ago
yflory 706120ae5b Display images uploaded in the File app with the Media app 8 years ago
yflory 28cb40d7ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 1b6fae4dd2 Update mediatag 8 years ago
ansuz a0c420af8e jshint compliance 8 years ago
ansuz 1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 78b11584f8 remove unused variables 8 years ago
yflory 4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a190c99426 Toolbar refactoring 8 years ago
ansuz 5739c3d973 blow up if you ever run out of nonce-space 8 years ago
ansuz 2232518c64 set title after uploading 8 years ago
ansuz f644dc6c0b WIP support encrypted file upload via base64 chunks 8 years ago
ansuz 7573b86946 call back with error if an RPC is made while disconnected 8 years ago
ansuz 410a9dfb17 temporary solution for testing pin limits 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 1d3b8188b3 Add mobile support in the slide app 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 f2672d587a fix variable redefinition 8 years ago
ansuz 0e7eeb285c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago