Commit graph

1641 commits

Author SHA1 Message Date
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
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
yflory
834830fc4f Fix the Ctrl key + click to select multiple files 2017-05-16 11:26:04 +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
yflory
7ee6864ea4 Add the user menu in the login and register pages 2017-05-15 18:21:11 +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
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
yflory
716245f864 Make all the buttons look the same 2017-05-15 16:16:50 +02:00
yflory
0f37d9def7 Change the button font size in the toolbar 2017-05-15 14:53:51 +02:00
yflory
48496416e7 Use the same font-size for all the toolbar buttons 2017-05-15 14:46:17 +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
03274c3776 Display an info message in the anonymous drive 2017-05-15 13:54:03 +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
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
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
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
7dd5907ff0 Merge branch 'limit' into staging 2017-05-12 14:21:46 +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
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
yflory
733c3abefa Update the upgrade button in the drive 2017-05-11 12:43:32 +02:00
yflory
becba33b05 Scroll to the selected element in the drive 2017-05-11 12:11:45 +02:00