1068 Commits (1fac0b9bc4c76158950f9b66d82ff58c2dbfb4ad)

Author SHA1 Message Date
yflory a5cb5f2ceb Merge branch 'staging' into newDrive 8 years ago
yflory 9cc25d4c9f Merge branch 'staging' into newDrive 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
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
yflory 1c2ea04f11 Drive refactoring 8 years ago
ansuz fe42f5e88c ask for new cookies and resend commands on NO_COOKIE errors 8 years ago
ansuz da533b106a improve type checking in getFileSize 8 years ago
ansuz d25477e8c6 don't let tooltips interfere with DOM interaction 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 767793b5ca fix stuck loading tip 8 years ago
ansuz f631973f1f optimize file upload 8 years ago
ansuz 55af84cc90 lower spinner timeout interval 8 years ago
ansuz 07279c8dc7 export boolean Test.testing 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 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 21c39572be Update media-tag and fix bower dependencies 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 9ca5bc507e add support for donate button 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
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
yflory df2b00122a New drive structure without file names 8 years ago
ansuz d9f7470f06 copy user details into sessionStorage for safari 8 years ago
ansuz fd83ae3e61 implement createRandomInteger 8 years ago
ansuz dc80b6b11f throttle markdown preview 8 years ago
ansuz e6c04ccb49 bump server after paying for an account 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 d55b7e411c Display an alert in the drive when the limit is reached 8 years ago
ansuz 71dc0af6c7 better test for success error codes 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 ba5ef5157e show pretty representations of storage usage 8 years ago
ansuz e78299aed6 use async file decryption, listen for progress events. 8 years ago
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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 2cee9534c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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
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 73ec91aa5e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 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
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
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 2dd04f7631 get limits from the server 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 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 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 42f3a62cac handle errors with XHR 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 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 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
ansuz 6d30d7f89f strip junk bytes from base64 more safely 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 5c8586f8a3 Fix typo in file upload 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 922e7803e9 remove extraneous slashes from hashes when parsing 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
yflory 63710e1ccc Move the code related to the title in another file 8 years ago
yflory ce5cdce917 Fix an issue where the username was lost on websocket reconnect 8 years ago
ansuz 42dcfb9661 unceremoniously kick web clients when you 'log out everywhere' 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 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 3e118c6a38 allow instance-wide custom salt for login 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 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 ef89451a83 Display the storage limit 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
yflory f414d480a9 Add the history mode to the CryptDrive 8 years ago
ansuz cf4dee28f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 28e4ef1b13 WIP RPC code 8 years ago
yflory afb0061d7b Fix an issue with anonymous user unable to store new pads 8 years ago
yflory 56aaeea003 Fix the drive toolbar not displaying the displayName 8 years ago
ansuz 3fa0a73025 prevent using string methods on undefined variable 8 years ago
ansuz 1b3ce5aa96 fix typo 8 years ago
yflory a51a35da70 Fix an issue with hashes ending with a slash 8 years ago
yflory ef58120819 Prevent multiple concurrent clicks to get the history 8 years ago
yflory 16f6ab813c Make it clear that the number is the history represents a version 8 years ago
yflory c820b3485c Fix function undefined when loading a template 8 years ago
yflory 0ef1c14d7f Fix lint errors 8 years ago
yflory fc760b4820 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a165332c15 Don't store a pad in the drive if the limit has been reached 8 years ago
ansuz e51c7f9cf0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 8 years ago
ansuz aedc46bdaf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a97e7223f1 implement getBlobPathFromHex 8 years ago
yflory 520dabe094 Remove the unsorted files category 8 years ago
yflory f50aa5c29b Move the mediatag viewer into a media app 8 years ago
yflory 6a8274518b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 9882a3a923 Add support for the file applicaiton in the drive 8 years ago
ansuz 12898b3358 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 74bcec8b31 programming is hard okay 8 years ago
yflory 2a417ddae8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory d985b144cc Add a new hash version for the file viewer 8 years ago
ansuz 3309087277 send feedback if isArray is not supported 8 years ago
ansuz 5194677443 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory c9c7d61ad1 Media tag viewer 8 years ago
ansuz 729d1460b9 Merge branch 'master' into staging 8 years ago
ansuz a840fb9e85 add example hashes and start working on hash v2 8 years ago
ansuz d1fa68e30d build UCF Media Tag 8 years ago
yflory fdd51ec18d Don't remove a folder moved into unsorted or into itself 8 years ago
ansuz 4fdc5f897e only feedback migration if user had legacy store 8 years ago
ansuz 218f2ff76c feedback when logging in or registering 8 years ago
yflory 4c3e842664 Fix focus issues with the history input in ckeditor 8 years ago
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 8 years ago
yflory 5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable 8 years ago
ansuz 18e2e66b06 jshint compliance 8 years ago
yflory 92ea03d7d9 View and restore the history of a pad 8 years ago
ansuz 4c0d7bf8e8 support multiple calls to cryptpad.ready 8 years ago
ansuz ec041c88e2 console.log when providing feedback
also notify server if a users browser does not support proxies
8 years ago
ansuz c51073f211 support batch getFileSize calls 8 years ago
ansuz 3afaf029cb feedback about how often we migrate an old drive 8 years ago
ansuz e8b053e48b use bootloader in feedback.html 8 years ago
ansuz 347459781c show the size of your files, if you're logged in 8 years ago
ansuz 2b8579e8b7 add pretty-printers for byte-counts 8 years ago
ansuz 2a25afae5f Merge branch 'soon' into staging 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
ansuz da69c1822c ask users to sign back if signing keys are missing 8 years ago
ansuz 821c1a3ec6 annotate code which we hope to be able to deprecate in the future 8 years ago
yflory 43c045721c Get the channel history 8 years ago
ansuz a27cc76fc0 uppercase LOL 8 years ago
ansuz 402ce2db93 better validation of inputs 8 years ago
ansuz c7eae9675b keep exporting isArray for backwards compatibility
but prevent internal use
8 years ago
ansuz fbebbf0dca minor clean up 8 years ago
ansuz 525d35c9ec redefine alert 8 years ago
ansuz f694a81a5c move more interface code out of cryptpad-common 8 years ago
ansuz a4157b9908 remove more unused functions 8 years ago
ansuz e10901edb2 begin to move interface code out of cryptpad-common 8 years ago
ansuz 95789d3cbe expose rpc for pinned usage 8 years ago
ansuz 8f4dbcf4c6 remove getPadTitle 8 years ago
ansuz f42da4ecd8 move hashChannelList into common-hash.js 8 years ago
ansuz 63960bd38c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 520ae822fc correct undefined reference 8 years ago
yflory 633d60ccd0 Remove a TODO 8 years ago
yflory 81d83897ec Rename hash.js 8 years ago
yflory 07705cd5c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory eb2a3c1bbf Fix lint errors 8 years ago
ansuz 607d9652f5 jshint compliance 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
ansuz 86c37bfa37 fix find+replace error 8 years ago
ansuz e618483395 extract all code for encoding and decoding hashes 8 years ago
ansuz fdd2716ad5 move constants to the top of cryptpad-common.js 8 years ago
yflory c1e0316d43 Refactor fileObject 8 years ago
ansuz 5212539a16 move standalone functions from common into their own file 8 years ago
ansuz 7437d6b902 remove unused function 8 years ago
ansuz 4e590a9dd1 remove even more dead code 8 years ago
ansuz 85fcaa9bbc remove more dead code 8 years ago
ansuz 401936a91e move singly-used css file out of /common/ 8 years ago
ansuz 7a59183bb1 pinpad.create should always be async 8 years ago
ansuz 8de3610532 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 9aa0548b1f remove dead cursor code 8 years ago
yflory 4e61b79f9a Clean fileObject 8 years ago
yflory cde724399c Pin the pads 8 years ago
ansuz 2c8d1b8183 jshint compliance 8 years ago
ansuz 05a50b1f4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz a14bb1480a progress for implicit pinning 8 years ago
ansuz f82278a25c handle return of undefined hash 8 years ago
ansuz 1d933be5a6 make reset return the hash, not an array with containing it 8 years ago
yflory f34492be94 Remove duplicates uid in the user list 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 84d8615cf1 Save and use templates in pad, code and slides 8 years ago
ansuz bd2034c47b prepare rpc before 'ready' if pinning is enabled 8 years ago
ansuz a70388284d disable unnecessary messages 8 years ago
ansuz abd87e1322 jshint compliance 8 years ago
ansuz e4b15bc616 implement 'getCanonicalChannelList' 8 years ago
ansuz a2f692b9a3 clean up serverside and clientside pinning logic 8 years ago
ansuz fdede0d1fd remove some dead code 8 years ago
ansuz e87992c7ec implement atomic pin reset rpc 8 years ago
ansuz 3380cf0348 implement getTotalSize rpc 8 years ago
ansuz 5c292fb1fa jshint compliance 8 years ago
ansuz 64089c5f6b implement pad pinning 8 years ago
yflory 13514dff63 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory 46a5eee597 Display the spinner in the toolbar for local changes 8 years ago
ansuz 6c7cdc90a9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 212baeb3a6 better cookie schema. expire old sessions 8 years ago
yflory 54d271c4e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
yflory a9777ce560 Fix input losing focus in polls with Chrome 57 8 years ago
ansuz 3e47b8a38d remove dead code 8 years ago
ansuz 182dbfc874 implement pinning logic in pinpad.js 8 years ago
ansuz a5e5ddae08 rpc all the things 8 years ago
ansuz 04069cc7f4 fix font size 8 years ago
ansuz 6e9968f989 add 'lol' code theme 8 years ago
ansuz 9b4b642d4a protect against subtly corrupted user objects 8 years ago
ansuz d4ce3dc6b9 don't rewrite css rules. FOUC is too long 8 years ago
ansuz 3cfd0a4326 commit some garbage 8 years ago
ansuz ed89a13fe6 progress on adding version string to some css 8 years ago
ansuz 76990ac1b2 version toolbar.css for cache-busting 8 years ago
ansuz a0c17d7c9b latest rpc code 8 years ago
ansuz 59a80d5fde remove silly TODO 8 years ago
yflory a8ffac5dcd Remove old code 8 years ago
ansuz fa9249ef29 don't notify for userlist changes if a user joins twice 8 years ago
ansuz 40f5e1706f add a unique id to user objects, define a getter 8 years ago
yflory 994d640f8b Fix an issue causing the lag icon to lose its color 8 years ago
yflory 6fbd1f0028 Store the dates as number and not strings to avoid ot issues 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
ansuz b542245086 fix lint error 8 years ago
ansuz cc43bb8362 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 8 years ago
ansuz 98027dad27 jshint compliance 8 years ago
ansuz 4a173e30dc set user's cursor to either the beginning or end of the document 8 years ago
yflory 29174b2922 Update the lag icon 8 years ago
yflory 26edb77cf0 Fix style and usability issues in slides 8 years ago
ansuz d422c7e165 support old hashes in getUserChannelList 8 years ago