Commit Graph
100 Commits
Author SHA1 Message Date
ansuz 8c49150725 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-12 10:54:32 +02:00
ansuz 5d37a50a87 try to estimate upload size 2017-05-10 18:57:25 +02:00
ansuz 6d30d7f89f strip junk bytes from base64 more safely 2017-05-10 18:15:33 +02:00
ansuz 1525712deb new encrypted file format 2017-05-10 17:13:26 +02:00
ansuz 8f5989b6b0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-10 17:05:13 +02:00
ansuz 5aba2d4640 remove unused variable 2017-05-10 15:36:34 +02:00
ansuz db2f7a5e36 add todos and change file id size 2017-05-10 15:36:14 +02:00
ansuz 97a28d3938 test file encryption/decryption 2017-05-10 11:56:10 +02:00
ansuz 6a1c799a6e support async tests 2017-05-10 11:54:21 +02:00
ansuz 922e7803e9 remove extraneous slashes from hashes when parsing 2017-05-10 11:54:05 +02:00
ansuz 299a53ded7 prefer to use functions from common 2017-05-09 18:54:56 +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
ansuz 56a871cb67 Merge branch 'soon' into staging 2017-05-09 16:50:54 +02:00
ansuz 521f99a3d6 support drag and drop for file upload 2017-05-09 16:50:25 +02:00
ansuz b4973b7610 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-05-09 15:11:38 +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
ansuz 2b4f503aff Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-05-09 11:55:31 +02:00
ansuz 4a104052b4 handle errors in file 2017-05-09 11:55:25 +02:00
ansuz 28f90a2893 document nginx config changes 2017-05-09 11:51:32 +02:00
ansuz 7da01d0862 unlist removed examples 2017-05-09 08:08:00 +02:00
ansuz ea3dc8a852 remove file upload test 2017-05-09 08:05:20 +02:00
ansuz 42dcfb9661 unceremoniously kick web clients when you 'log out everywhere' 2017-05-05 18:25:55 +02:00
ansuz 36ab38f3ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:58:33 +02:00
ansuz 6471b572eb correct off-by-one 2017-05-05 15:40:31 +02:00
ansuz 3a338e0890 fix undefined reference 2017-05-05 15:20:41 +02:00
ansuz 6909f663b6 modify 'log out everywhere' text 2017-05-05 15:18:32 +02:00
ansuz a173e4c7a0 add 'log out everywhere' functionality in settings 2017-05-05 15:09:07 +02:00
ansuz c07d3e6162 update version strings for upcoming release 2017-05-05 11:51:41 +02:00
ansuz 4c359bbb29 add notes about upgrading 2017-05-05 11:50:10 +02:00
ansuz 486d96e818 document upload configuration 2017-05-05 11:28:31 +02:00
ansuz 3ad99be1ef restrict uploads to authenticated users 2017-05-05 11:17:55 +02:00
ansuz f329726fa4 fix undefined reference 2017-05-05 09:12:16 +02:00
ansuz 3e118c6a38 allow instance-wide custom salt for login 2017-05-05 09:10:31 +02:00
ansuz d923fd1b76 close writeStreams before expiring a stream 2017-05-05 09:00:54 +02:00
ansuz 6a00d11a15 fix undefined reference 2017-05-04 18:28:52 +02:00
ansuz c3d1554e8c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-04 18:25:23 +02:00
ansuz 660cda6573 set title when uploading 2017-05-04 18:25:06 +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
ansuz 5739c3d973 blow up if you ever run out of nonce-space 2017-05-04 12:20:38 +02:00
ansuz 2232518c64 set title after uploading 2017-05-04 12:01:37 +02:00
ansuz 5f700c7451 cleanup and jshint compliance 2017-05-04 11:46:11 +02:00
ansuz f644dc6c0b WIP support encrypted file upload via base64 chunks 2017-05-04 11:37:46 +02:00
ansuz ca7b76a812 prototype of encypted file uploads 2017-05-04 11:36:56 +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
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
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
ansuz 841c9ee9de don't close popup dialog when hitting enter if textarea has focus 2017-04-28 16:11:22 +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
ansuz 38a115d8f8 feedback on anonymous drive 2017-04-28 14:08:17 +02:00
ansuz e7c4c37130 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 13:57:50 +02:00
ansuz 4d48c88807 create blob and blobstage stores if not exists 2017-04-28 12:49:08 +02:00
ansuz 69368def48 make pin, blob, and blobstage path configurable 2017-04-28 12:48:36 +02:00
ansuz e51c7f9cf0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-28 11:46:24 +02:00
ansuz fe93da8817 get ready to implement blob storage 2017-04-28 11:46:13 +02:00
ansuz e132ccf94a prepare for upload 2017-04-28 11:45:53 +02:00
ansuz e2942f959b add crypto for decrypting a chunked file 2017-04-27 12:56:42 +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
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
ansuz 3309087277 send feedback if isArray is not supported 2017-04-25 17:09:39 +02:00
ansuz f196b836db fix undefined reference 2017-04-25 16:17:52 +02:00
ansuz f8f97036be ignore media-tag.js 2017-04-25 16:12:28 +02:00
ansuz 48973bccd6 add tests to assert for hash parsing 2017-04-25 16:11:19 +02:00
ansuz 5194677443 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-25 14:57:34 +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 9c2da10d79 bump version to 1.5.0 2017-04-25 11:01:19 +02:00
ansuz d1fa68e30d build UCF Media Tag 2017-04-24 17:13:32 +02:00
ansuz cc33c4abe9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-04-24 15:41:46 +02:00
ansuz a5ca461a73 update footer for new version 2017-04-24 15:41:29 +02:00
ansuz 4b95a1da48 unbreak assert/translations 2017-04-24 14:32:56 +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
ansuz f7e96b4e8c resolve merge conflicts and jquery errors 2017-04-24 13:43:18 +02:00
ansuz 81c5e26a0a validate rpc messages more carefully 2017-04-24 12:10:12 +02:00
ansuz 9e749b7cd8 handle invalid channels 2017-04-24 11:40:13 +02:00
ansuz 18e2e66b06 jshint compliance 2017-04-24 11:39:39 +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 1af621bfe5 Merge remote-tracking branch 'origin/auth' into staging 2017-04-20 17:27:32 +02:00
ansuz 3afaf029cb feedback about how often we migrate an old drive 2017-04-20 17:06:09 +02:00
ansuz df9c312b7d make new text translateable 2017-04-18 18:31:58 +02:00
ansuz e8b053e48b use bootloader in feedback.html 2017-04-18 17:31:35 +02:00
ansuz a6dbfcecf3 remove old/unused assertions 2017-04-18 17:28:09 +02:00
ansuz b658bda421 use bootloader to fix paths to jquery and json.sortify 2017-04-18 17:24:46 +02:00
ansuz fd067510fe support logging feedback api via config.js 2017-04-18 15:51:42 +02:00
ansuz 8f352c8433 add justify plugin to default ckeditor config 2017-04-18 15:49:31 +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