Commit Graph

2552 Commits (df5cbfb53e01e886acd3bc57dd1063e79ea1c76a)

Author SHA1 Message Date
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
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
yflory cf81b02096 Make sure the spinner is always centered in the loading screen 2017-05-10 16:11:41 +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
ansuz db2f7a5e36 add todos and change file id size 2017-05-10 15:36:14 +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