Commit Graph

2628 Commits (f9c26645cf3487d4aff847628fda6c88f553bcd9)

Author SHA1 Message Date
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
Pierre Bondoerffer ad5e18f558
Spanish update 2017-05-15 12:05:50 +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
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 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
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 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
yflory e0293a1162 Merge branch 'master' into staging 2017-05-11 18:26:09 +02:00
yflory d2ba8f1c27 Use the new format for the storage limits 2017-05-11 18:07:29 +02:00
yflory e123ad0333 Use a POST request to get the storage limits 2017-05-11 16:31:14 +02:00
yflory 57ee7de7d4 Update and return the storage limit 2017-05-11 16:12:44 +02:00
Caleb James DeLisle 5348303df6 Bad code, lint failure 2017-05-11 16:02:24 +02:00
Caleb James DeLisle b2b1f08d01 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-11 15:54:27 +02:00
Caleb James DeLisle 9a6d63960b Added a script to get the amount of data which is pinned 2017-05-11 15:54:15 +02:00
yflory d3854b9774 Fix selection issues in the drive with Chrome 2017-05-11 14:31:15 +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
yflory 419fb15425 Remember the scroll position in the drive tree 2017-05-11 11:20:18 +02:00
yflory 5d0535966c Center vertically slides in present mode and checkbox to disable transitions 2017-05-11 10:58:33 +02:00