Commit graph

1587 commits

Author SHA1 Message Date
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
yflory
5a21be8112 Improve UI on mobile 2017-05-10 15:54:09 +02:00
ansuz
5aba2d4640 remove unused variable 2017-05-10 15:36:34 +02:00
yflory
5c8586f8a3 Fix typo in file upload 2017-05-10 15:00:05 +02:00
yflory
1e4fc5a979 lint 2017-05-10 14:56:50 +02:00
yflory
3c4b6a89d2 Fix a conflict with the arrow keys and renaming a folder in the tree 2017-05-10 14:48:15 +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
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
yflory
0f8ef2f516 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-10 11:45:25 +02:00
yflory
6a8153aca3 Fix selection issues in the drive with Chrome 2017-05-10 11:44:58 +02:00
yflory
a6c49cd65c Fix undefined title in slides present mode 2017-05-10 10:49:59 +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
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
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
yflory
63710e1ccc Move the code related to the title in another file 2017-05-09 14:32:41 +02:00
yflory
48898c97e5 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-05-09 14:31:42 +02:00
yflory
ce5cdce917 Fix an issue where the username was lost on websocket reconnect 2017-05-09 14:31:28 +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
yflory
b818fd8a37 Fix 'undefined' error with the context menu 2017-05-09 11:20:06 +02:00
yflory
c34c1cb07c Press enter to open a folder 2017-05-09 11:03:47 +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
yflory
1547063b7f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 18:13:31 +02:00
yflory
a20a319a7a Fix focus issues in the CryptDrive search bar 2017-05-05 18:13:14 +02:00
ansuz
36ab38f3ac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-05 17:58:33 +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
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
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
c07d3e6162 update version strings for upcoming release 2017-05-05 11:51:41 +02:00