Commit Graph

880 Commits (852c028822f513bfe15b5ce90c02e5fc4543a2d8)

Author SHA1 Message Date
yflory d13dde856a Add the markdown renderer file and change code's default content 2017-05-18 14:26:56 +02:00
ansuz 73ec91aa5e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 12:46:36 +02:00
ansuz 7befaccd88 move more rpc calls into pinpad 2017-05-18 12:36:12 +02:00
yflory 56bcdff890 Add a preview of the markdown content in the code editor 2017-05-18 12:16:26 +02:00
yflory b72415b56b Fix old hashes not working with the new parser 2017-05-18 10:13:08 +02:00
yflory 6b7aeb9121 Fix the text example 2017-05-17 15:48:09 +02:00
yflory fe0f21594a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-16 14:41:51 +02:00
yflory 953e7155f0 Send only the hostname to the accounts server 2017-05-16 14:41:40 +02:00
ansuz afef456b18 fix undefined reference 2017-05-16 14:15:42 +02:00
yflory 1a7c4d5ebe Store the FS_hash in the user object after the merge 2017-05-16 11:25:37 +02:00
yflory 87fa28180a Display an upgrade button in the settings page 2017-05-16 10:34:50 +02:00
yflory c1b43db363 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 18:21:25 +02:00
ansuz 1542aa96bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 18:17:56 +02:00
yflory dc2cdb7c08 Add the usage bar in the settings page 2017-05-15 18:16:22 +02:00
ansuz 2dd04f7631 get limits from the server 2017-05-15 18:03:12 +02:00
yflory 8172f117a7 Fix Hash.alert not a function 2017-05-15 14:21:15 +02:00
yflory 0e58859393 Fix lint error 2017-05-15 13:55:40 +02:00
yflory 771348720b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 13:54:25 +02:00
yflory 57979f6314 Display the public key using a href in the settings page 2017-05-15 13:53:43 +02:00
ansuz a9b670fdf5 don't parse trailing slash as part of encryption key in old hashes 2017-05-15 11:17:46 +02:00
ansuz 06f3d0eefe shim isArray if not exists. correctly report how often this occurs 2017-05-15 10:26:52 +02:00
yflory 50d9f72b3a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-12 18:06:37 +02:00
yflory 601226115b New anonymous drive 2017-05-12 18:06:29 +02:00
ansuz 30f6ef3f85 handle more response codes, use metadata 2017-05-12 17:34:29 +02:00
ansuz 18d959ef16 handle non-200 status codes 2017-05-12 17:07:30 +02:00
yflory ed95bbb08f Fix lint errors 2017-05-12 16:43:01 +02:00
yflory 89a993be3c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-12 16:33:56 +02:00
yflory 0f13198119 Move the parseHash code into parsePadUrl 2017-05-12 16:33:45 +02:00
ansuz 42f3a62cac handle errors with XHR 2017-05-12 16:13:09 +02:00
ansuz 6c68b5e6ca use new media-tag, listen for decryption events 2017-05-12 15:42:01 +02:00
ansuz 7dd5907ff0 Merge branch 'limit' into staging 2017-05-12 14:21:46 +02:00
ansuz a993ab6616 use new encrypted file encoding in media-tag 2017-05-12 11:25:07 +02:00
ansuz 8c49150725 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-12 10:54:32 +02:00
yflory e0293a1162 Merge branch 'master' into staging 2017-05-11 18:26:09 +02:00
yflory 57ee7de7d4 Update and return the storage limit 2017-05-11 16:12:44 +02:00
yflory 371edff943 Fix an error when moving unsorted files to root in the drive 2017-05-11 14:24:16 +02:00
yflory b76dcba1d6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-11 12:43:49 +02:00
ansuz 6d30d7f89f strip junk bytes from base64 more safely 2017-05-10 18:15:33 +02:00
ansuz 8f5989b6b0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-10 17:05:13 +02:00
yflory cf81b02096 Make sure the spinner is always centered in the loading screen 2017-05-10 16:11:41 +02:00
yflory 5c8586f8a3 Fix typo in file upload 2017-05-10 15:00:05 +02:00
yflory 96ccb94397 Add the share button when a file upload is complete 2017-05-10 14:44:01 +02:00
yflory c00158d23a Move code to common-history 2017-05-10 13:39:14 +02:00
ansuz 922e7803e9 remove extraneous slashes from hashes when parsing 2017-05-10 11:54:05 +02:00
ansuz a338b23f40 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-09 18:36:27 +02:00
ansuz df47b913e3 fetch array buffers in cryptpad-common 2017-05-09 18:36:18 +02:00
yflory ff16084719 Fix lint errors 2017-05-09 18:10:02 +02:00
yflory 50c8a859e6 Move the CodeMirror cursor code to common-codemirror 2017-05-09 17:57:27 +02:00
yflory 9eb8e55cf6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-09 17:48:07 +02:00
yflory c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files 2017-05-09 17:47:47 +02:00
yflory 63710e1ccc Move the code related to the title in another file 2017-05-09 14:32:41 +02:00
yflory ce5cdce917 Fix an issue where the username was lost on websocket reconnect 2017-05-09 14:31:28 +02:00
ansuz 42dcfb9661 unceremoniously kick web clients when you 'log out everywhere' 2017-05-05 18:25:55 +02:00
yflory 9206d89531 Fix lint errors 2017-05-05 17:58:32 +02:00
yflory bbc08bbcfd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:57:05 +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
yflory 6847906ac9 Move the userlist code in a separate file 2017-05-05 15:47:46 +02:00
ansuz 3a338e0890 fix undefined reference 2017-05-05 15:20:41 +02:00
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings 2017-05-05 15:09:07 +02:00
yflory 5a5b02b82b Don't store in the drive pads without a hash 2017-05-05 11:55:19 +02:00
ansuz 3e118c6a38 allow instance-wide custom salt for login 2017-05-05 09:10:31 +02:00
yflory 706120ae5b Display images uploaded in the File app with the Media app 2017-05-04 18:24:58 +02:00
yflory 28cb40d7ee Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 17:14:30 +02:00
yflory 1b6fae4dd2 Update mediatag 2017-05-04 17:14:24 +02:00
ansuz a0c420af8e jshint compliance 2017-05-04 16:37:25 +02:00
ansuz 1864dac84f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:16:16 +02:00
ansuz 78b11584f8 remove unused variables 2017-05-04 16:16:09 +02:00
yflory 4335b050af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 16:08:21 +02:00
yflory a190c99426 Toolbar refactoring 2017-05-04 16:08:12 +02:00
ansuz 7573b86946 call back with error if an RPC is made while disconnected 2017-05-04 11:36:24 +02:00
ansuz 410a9dfb17 temporary solution for testing pin limits 2017-05-04 11:20:52 +02:00
yflory ef89451a83 Display the storage limit in the drive 2017-05-02 17:14:53 +02:00
ansuz f2672d587a fix variable redefinition 2017-05-02 09:42:51 +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 cf4dee28f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 17:13:18 +02:00
ansuz 28e4ef1b13 WIP RPC code 2017-04-28 17:11:50 +02:00
yflory afb0061d7b Fix an issue with anonymous user unable to store new pads 2017-04-28 17:11:07 +02:00
yflory 56aaeea003 Fix the drive toolbar not displaying the displayName 2017-04-28 17:03:47 +02:00
ansuz 3fa0a73025 prevent using string methods on undefined variable 2017-04-28 16:09:46 +02:00
ansuz 1b3ce5aa96 fix typo 2017-04-28 16:08:47 +02:00
yflory a51a35da70 Fix an issue with hashes ending with a slash 2017-04-28 15:47:31 +02:00
yflory ef58120819 Prevent multiple concurrent clicks to get the history 2017-04-28 14:09:59 +02:00
yflory 16f6ab813c Make it clear that the number is the history represents a version 2017-04-28 13:06:55 +02:00
yflory c820b3485c Fix function undefined when loading a template 2017-04-28 12:16:45 +02:00
yflory 0ef1c14d7f Fix lint errors 2017-04-28 12:12:17 +02:00
yflory fc760b4820 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 12:08:21 +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
ansuz e51c7f9cf0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 11:46:24 +02:00
yflory bf7c7c45d0 Add the storage limit warning in the toolbar 2017-04-27 18:46:46 +02:00
ansuz aedc46bdaf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-27 12:47:27 +02:00
ansuz a97e7223f1 implement getBlobPathFromHex 2017-04-27 12:47:21 +02:00
yflory 520dabe094 Remove the unsorted files category 2017-04-26 18:46:40 +02:00
yflory f50aa5c29b Move the mediatag viewer into a media app 2017-04-26 14:55:06 +02:00
yflory 6a8274518b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 18:42:33 +02:00
yflory 9882a3a923 Add support for the file applicaiton in the drive 2017-04-25 18:42:21 +02:00
ansuz 12898b3358 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 18:28:48 +02:00
ansuz 74bcec8b31 programming is hard okay 2017-04-25 18:28:39 +02:00
yflory 2a417ddae8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 17:22:07 +02:00
yflory d985b144cc Add a new hash version for the file viewer 2017-04-25 17:19:13 +02:00
ansuz 3309087277 send feedback if isArray is not supported 2017-04-25 17:09:39 +02:00
ansuz 5194677443 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 14:57:34 +02:00
yflory c9c7d61ad1 Media tag viewer 2017-04-25 14:55:38 +02:00
ansuz 729d1460b9 Merge branch 'master' into staging 2017-04-25 14:35:24 +02:00
ansuz a840fb9e85 add example hashes and start working on hash v2 2017-04-25 14:33:57 +02:00
ansuz d1fa68e30d build UCF Media Tag 2017-04-24 17:13:32 +02:00
yflory fdd51ec18d Don't remove a folder moved into unsorted or into itself 2017-04-24 15:38:03 +02:00
ansuz 4fdc5f897e only feedback migration if user had legacy store 2017-04-24 14:26:55 +02:00
ansuz 218f2ff76c feedback when logging in or registering 2017-04-24 14:15:17 +02:00
yflory 4c3e842664 Fix focus issues with the history input in ckeditor 2017-04-24 13:55:03 +02:00
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00
yflory 5fc2e4cf71 Remove the toolbar in ckeditor history mode + history configurable 2017-04-24 11:41:00 +02:00
ansuz 18e2e66b06 jshint compliance 2017-04-24 11:39:39 +02:00
yflory 92ea03d7d9 View and restore the history of a pad 2017-04-21 17:31:47 +02:00
ansuz 4c0d7bf8e8 support multiple calls to cryptpad.ready 2017-04-21 16:51:32 +02:00
ansuz ec041c88e2 console.log when providing feedback
also notify server if a users browser does not support proxies
2017-04-21 15:53:13 +02:00
ansuz c51073f211 support batch getFileSize calls 2017-04-21 14:51:20 +02:00
ansuz 3afaf029cb feedback about how often we migrate an old drive 2017-04-20 17:06:09 +02:00
ansuz e8b053e48b use bootloader in feedback.html 2017-04-18 17:31:35 +02:00
ansuz 347459781c show the size of your files, if you're logged in 2017-04-18 15:49:04 +02:00
ansuz 2b8579e8b7 add pretty-printers for byte-counts 2017-04-18 15:44:15 +02:00
ansuz 2a25afae5f Merge branch 'soon' into staging 2017-04-18 12:24:45 +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
ansuz da69c1822c ask users to sign back if signing keys are missing 2017-04-18 11:58:41 +02:00
ansuz 821c1a3ec6 annotate code which we hope to be able to deprecate in the future 2017-04-14 18:44:08 +02:00
yflory 43c045721c Get the channel history 2017-04-14 18:36:36 +02:00
ansuz a27cc76fc0 uppercase LOL 2017-04-14 15:35:02 +02:00
ansuz 402ce2db93 better validation of inputs 2017-04-14 15:34:22 +02:00
ansuz c7eae9675b keep exporting isArray for backwards compatibility
but prevent internal use
2017-04-14 15:34:05 +02:00
ansuz fbebbf0dca minor clean up 2017-04-14 15:32:12 +02:00
ansuz 525d35c9ec redefine alert 2017-04-14 14:54:43 +02:00
ansuz f694a81a5c move more interface code out of cryptpad-common 2017-04-14 12:25:32 +02:00
ansuz a4157b9908 remove more unused functions 2017-04-14 12:14:10 +02:00
ansuz e10901edb2 begin to move interface code out of cryptpad-common 2017-04-14 12:09:00 +02:00
ansuz 95789d3cbe expose rpc for pinned usage 2017-04-14 11:41:51 +02:00
ansuz 8f4dbcf4c6 remove getPadTitle 2017-04-14 11:41:18 +02:00
ansuz f42da4ecd8 move hashChannelList into common-hash.js 2017-04-14 11:40:28 +02:00
ansuz 63960bd38c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-13 19:47:04 +02:00
ansuz 520ae822fc correct undefined reference 2017-04-13 19:46:52 +02:00
yflory 633d60ccd0 Remove a TODO 2017-04-13 17:19:32 +02:00
yflory 81d83897ec Rename hash.js 2017-04-13 17:04:15 +02:00
yflory 07705cd5c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-13 15:04:23 +02:00
yflory eb2a3c1bbf Fix lint errors 2017-04-13 15:04:17 +02:00
ansuz 607d9652f5 jshint compliance 2017-04-13 14:48:15 +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
ansuz 86c37bfa37 fix find+replace error 2017-04-13 11:11:45 +02:00
ansuz e618483395 extract all code for encoding and decoding hashes 2017-04-13 11:05:28 +02:00
ansuz fdd2716ad5 move constants to the top of cryptpad-common.js 2017-04-13 10:31:08 +02:00
yflory c1e0316d43 Refactor fileObject 2017-04-12 18:54:22 +02:00
ansuz 5212539a16 move standalone functions from common into their own file 2017-04-12 17:54:44 +02:00
ansuz 7437d6b902 remove unused function 2017-04-12 17:09:42 +02:00
ansuz 4e590a9dd1 remove even more dead code 2017-04-12 16:16:58 +02:00
ansuz 85fcaa9bbc remove more dead code 2017-04-12 16:13:25 +02:00
ansuz 401936a91e move singly-used css file out of /common/ 2017-04-12 16:09:05 +02:00
ansuz 7a59183bb1 pinpad.create should always be async 2017-04-12 16:02:42 +02:00
ansuz 8de3610532 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-12 16:02:09 +02:00
ansuz 9aa0548b1f remove dead cursor code 2017-04-12 15:59:30 +02:00
yflory 4e61b79f9a Clean fileObject 2017-04-11 15:11:33 +02:00
yflory cde724399c Pin the pads 2017-04-11 14:53:44 +02:00
ansuz 2c8d1b8183 jshint compliance 2017-04-10 19:12:22 +02:00
ansuz 05a50b1f4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-10 17:42:43 +02:00
ansuz a14bb1480a progress for implicit pinning 2017-04-10 17:42:35 +02:00
ansuz f82278a25c handle return of undefined hash 2017-04-10 17:38:25 +02:00
ansuz 1d933be5a6 make reset return the hash, not an array with containing it 2017-04-10 15:57:38 +02:00
yflory f34492be94 Remove duplicates uid in the user list 2017-04-10 15:27:01 +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 84d8615cf1 Save and use templates in pad, code and slides 2017-04-07 18:20:03 +02:00
ansuz bd2034c47b prepare rpc before 'ready' if pinning is enabled 2017-04-07 17:24:25 +02:00
ansuz a70388284d disable unnecessary messages 2017-04-07 17:21:04 +02:00
ansuz abd87e1322 jshint compliance 2017-04-07 16:33:14 +02:00
ansuz e4b15bc616 implement 'getCanonicalChannelList' 2017-04-07 15:52:34 +02:00
ansuz a2f692b9a3 clean up serverside and clientside pinning logic 2017-04-07 15:20:30 +02:00
ansuz fdede0d1fd remove some dead code 2017-04-07 12:18:03 +02:00
ansuz e87992c7ec implement atomic pin reset rpc 2017-04-07 11:37:19 +02:00
ansuz 3380cf0348 implement getTotalSize rpc 2017-04-07 10:09:59 +02:00
ansuz 5c292fb1fa jshint compliance 2017-04-06 08:32:31 +02:00
ansuz 64089c5f6b implement pad pinning 2017-04-05 17:28:04 +02:00
yflory 13514dff63 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 15:00:10 +02:00
yflory 46a5eee597 Display the spinner in the toolbar for local changes 2017-04-05 14:57:07 +02:00
ansuz 6c7cdc90a9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 12:24:17 +02:00
ansuz 212baeb3a6 better cookie schema. expire old sessions 2017-04-05 12:24:01 +02:00
yflory 54d271c4e7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-05 12:04:18 +02:00
yflory a9777ce560 Fix input losing focus in polls with Chrome 57 2017-04-05 12:04:01 +02:00
ansuz 3e47b8a38d remove dead code 2017-04-05 10:42:24 +02:00
ansuz 182dbfc874 implement pinning logic in pinpad.js 2017-04-04 12:13:31 +02:00
ansuz a5e5ddae08 rpc all the things 2017-04-03 19:24:57 +02:00
ansuz 04069cc7f4 fix font size 2017-03-31 13:28:30 +02:00
ansuz 6e9968f989 add 'lol' code theme 2017-03-31 09:19:45 +02:00
ansuz 9b4b642d4a protect against subtly corrupted user objects 2017-03-30 17:19:49 +02:00
ansuz d4ce3dc6b9 don't rewrite css rules. FOUC is too long 2017-03-29 16:02:04 +02:00
ansuz 3cfd0a4326 commit some garbage 2017-03-29 15:40:34 +02:00
ansuz ed89a13fe6 progress on adding version string to some css 2017-03-29 12:55:36 +02:00
ansuz 76990ac1b2 version toolbar.css for cache-busting 2017-03-29 11:56:03 +02:00
ansuz a0c17d7c9b latest rpc code 2017-03-27 18:15:15 +02:00
ansuz 59a80d5fde remove silly TODO 2017-03-27 12:08:19 +02:00
yflory a8ffac5dcd Remove old code 2017-03-27 11:30:09 +02:00
ansuz fa9249ef29 don't notify for userlist changes if a user joins twice 2017-03-24 13:17:51 +01:00