Commit Graph
100 Commits
Author SHA1 Message Date
ansuz a99080fb74 push the rest of the code 2017-05-22 12:31:00 +02:00
ansuz dd73ad2dd5 add decryptMetadata function 2017-05-22 12:26:44 +02:00
ansuz 5179252d3b fix merge conflicts 2017-05-22 12:11:24 +02:00
ansuz 6e7fe87974 WIP debug file upload errors. use better error strings 2017-05-22 12:06:29 +02:00
ansuz 4ee42b87d4 make file crypto great again 2017-05-22 12:04:47 +02:00
ansuz 03da870a7a jshint compliance 2017-05-19 19:38:57 +02:00
ansuz af4fd3c6d3 resolve merge conflicts 2017-05-19 19:14:08 +02:00
ansuz ba5ef5157e show pretty representations of storage usage 2017-05-19 18:37:31 +02:00
ansuz 1378a0c1f6 serve blobs from configured location 2017-05-19 17:01:09 +02:00
ansuz 0a54f0cf2d better alignment of preview and code entry 2017-05-19 16:21:26 +02:00
ansuz 0d265f543e add file.css to npm style command 2017-05-19 14:41:55 +02:00
ansuz 7d369fb5e0 move rpc warnings out of server and into rpc 2017-05-19 14:37:00 +02:00
ansuz e78299aed6 use async file decryption, listen for progress events. 2017-05-19 11:46:47 +02:00
ansuz bcd0303821 style /file/ with .less 2017-05-19 11:46:10 +02:00
ansuz ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-19 09:13:38 +02:00
ansuz 310909dc9e handle new error codes 2017-05-19 09:12:59 +02:00
ansuz d9f128e923 send appropriate responses to upload rpc calls 2017-05-19 09:12:39 +02:00
ansuz d71e12713a handle empty arrays when reducing 2017-05-19 09:11:28 +02:00
ansuz e7a458295b new translation keys for file upload 2017-05-19 09:10:36 +02:00
ansuz 34606ea8ba use newest xwiki media-tag 2017-05-18 18:24:24 +02:00
ansuz 5a83259233 listen for decryption errors 2017-05-18 18:24:04 +02:00
ansuz 2cee9534c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 17:58:33 +02:00
ansuz d324a054f2 add progress bar to file upload 2017-05-18 17:57:42 +02:00
ansuz 164342920e fix inverted condition 2017-05-18 15:39:24 +02:00
ansuz d187945e94 jshint compliance 2017-05-18 14:55:16 +02:00
ansuz 3ba94a1ba2 correctly set release version number 2017-05-18 14:54:02 +02:00
ansuz 4debec39bb update footer with next release codename and corrected matrix link 2017-05-18 12:58:49 +02:00
ansuz 73ec91aa5e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 12:46:36 +02:00
ansuz df1433b53f don't pin if users don't have space.
better validation of rpc calls
2017-05-18 12:45:40 +02:00
ansuz 80479fdc90 use rpc calls from cryptpad common 2017-05-18 12:44:16 +02:00
ansuz 7befaccd88 move more rpc calls into pinpad 2017-05-18 12:36:12 +02:00
ansuz 98828730b4 refactor more 2017-05-16 18:08:59 +02:00
ansuz 24eb928ef8 simplify rpc function signatures 2017-05-16 17:07:53 +02:00
ansuz a97a6caf9b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-16 15:11:31 +02:00
ansuz c381e85384 correctly identify users' limits by unescaped public key 2017-05-16 15:11:20 +02:00
ansuz 517438d7c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-16 14:33:34 +02:00
ansuz 81af9225fc template a Romanian translation 2017-05-16 14:32:54 +02:00
ansuz afef456b18 fix undefined reference 2017-05-16 14:15:42 +02:00
ansuz 8fe0282b7b jshint compliance 2017-05-16 14:14:30 +02:00
ansuz 827233dcba new translation keys for file upload 2017-05-16 14:01:06 +02:00
ansuz 1542aa96bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 18:17:56 +02:00
ansuz dfe3eac606 big rpc refactor:
* support pinning files
* include pinned files in usage calculation
* safer session handling
* fix bugs in limit update code
2017-05-15 18:12:10 +02:00
ansuz cc893723de add some TODOs, log uploaded content so we know it's working 2017-05-15 18:10:22 +02:00
ansuz 2dd04f7631 get limits from the server 2017-05-15 18:03:12 +02:00
ansuz 591c5a7844 add TODOs, integrate upload size checks 2017-05-15 11:59:36 +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 9bbd3161ca update tests for new API changes 2017-05-15 11:11:12 +02:00
ansuz 06f3d0eefe shim isArray if not exists. correctly report how often this occurs 2017-05-15 10:26:52 +02:00
ansuz bef5aa0b2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-15 09:52:57 +02:00
ansuz fc49715bc0 document 'enableFeedback' in the server conf 2017-05-13 12:32:26 +02:00
ansuz 3388724367 resolve merge conflicts 2017-05-12 17:40:35 +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
ansuz 4c4c21342d don't try to decrypt nothing 2017-05-12 16:26:51 +02:00
ansuz 69e933dd17 better error handling in file download 2017-05-12 16:17:10 +02:00
ansuz 42f3a62cac handle errors with XHR 2017-05-12 16:13:09 +02:00
ansuz 213708d8dc center media tags 2017-05-12 15:43:32 +02:00
ansuz 6c68b5e6ca use new media-tag, listen for decryption events 2017-05-12 15:42:01 +02:00
ansuz fa4b17e2bc use callback in 'getLimit' 2017-05-12 15:39:55 +02:00
ansuz 77efc2cee7 bump version for upcoming release 2017-05-12 14:24:52 +02:00
ansuz 7dd5907ff0 Merge branch 'limit' into staging 2017-05-12 14:21:46 +02:00
ansuz a249435003 refactor limit handling a bit 2017-05-12 14:19:36 +02:00
ansuz 22efde87d5 correctly estimate upload size 2017-05-12 12:12:51 +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
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