Commit Graph

  • 81af9225fc template a Romanian translation ansuz 2017-05-16 14:32:54 +02:00
  • e8275c02c6 Merge pull request #115 from pbondoer/spanish ansuz 2017-05-16 14:23:06 +02:00
  • afef456b18 fix undefined reference ansuz 2017-05-16 14:15:42 +02:00
  • 8fe0282b7b jshint compliance ansuz 2017-05-16 14:14:30 +02:00
  • ad6217f064 file upload spanish keys Pierre Bondoerffer 2017-05-16 14:05:36 +02:00
  • 827233dcba new translation keys for file upload ansuz 2017-05-16 14:01:06 +02:00
  • 834830fc4f Fix the Ctrl key + click to select multiple files yflory 2017-05-16 11:25:51 +02:00
  • 1a7c4d5ebe Store the FS_hash in the user object after the merge yflory 2017-05-16 11:25:37 +02:00
  • 87fa28180a Display an upgrade button in the settings page yflory 2017-05-16 10:34:50 +02:00
  • c1b43db363 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-15 18:21:25 +02:00
  • 7ee6864ea4 Add the user menu in the login and register pages yflory 2017-05-15 18:21:11 +02:00
  • 1542aa96bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-15 18:17:56 +02:00
  • dc2cdb7c08 Add the usage bar in the settings page yflory 2017-05-15 18:16:22 +02:00
  • dfe3eac606 big rpc refactor: ansuz 2017-05-15 18:12:10 +02:00
  • cc893723de add some TODOs, log uploaded content so we know it's working ansuz 2017-05-15 18:10:22 +02:00
  • 2dd04f7631 get limits from the server ansuz 2017-05-15 18:03:12 +02:00
  • 716245f864 Make all the buttons look the same yflory 2017-05-15 16:16:50 +02:00
  • 0f37d9def7 Change the button font size in the toolbar yflory 2017-05-15 14:53:51 +02:00
  • 48496416e7 Use the same font-size for all the toolbar buttons yflory 2017-05-15 14:46:17 +02:00
  • 8172f117a7 Fix Hash.alert not a function yflory 2017-05-15 14:21:15 +02:00
  • 0e58859393 Fix lint error yflory 2017-05-15 13:55:40 +02:00
  • 771348720b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-15 13:54:25 +02:00
  • 03274c3776 Display an info message in the anonymous drive yflory 2017-05-15 13:54:03 +02:00
  • 57979f6314 Display the public key using a href in the settings page yflory 2017-05-15 13:53:43 +02:00
  • ad5e18f558 Spanish update Pierre Bondoerffer 2017-05-15 12:05:50 +02:00
  • 591c5a7844 add TODOs, integrate upload size checks ansuz 2017-05-15 11:59:36 +02:00
  • a9b670fdf5 don't parse trailing slash as part of encryption key in old hashes ansuz 2017-05-15 11:17:46 +02:00
  • 9bbd3161ca update tests for new API changes ansuz 2017-05-15 11:11:12 +02:00
  • 06f3d0eefe shim isArray if not exists. correctly report how often this occurs ansuz 2017-05-15 10:26:52 +02:00
  • bef5aa0b2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-15 09:52:57 +02:00
  • fc49715bc0 document 'enableFeedback' in the server conf ansuz 2017-05-13 12:32:26 +02:00
  • 50d9f72b3a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-12 18:06:37 +02:00
  • 601226115b New anonymous drive yflory 2017-05-12 18:06:29 +02:00
  • 3388724367 resolve merge conflicts ansuz 2017-05-12 17:40:35 +02:00
  • 30f6ef3f85 handle more response codes, use metadata ansuz 2017-05-12 17:34:29 +02:00
  • 18d959ef16 handle non-200 status codes ansuz 2017-05-12 17:07:30 +02:00
  • ed95bbb08f Fix lint errors yflory 2017-05-12 16:43:01 +02:00
  • 89a993be3c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-12 16:33:56 +02:00
  • 0f13198119 Move the parseHash code into parsePadUrl yflory 2017-05-12 16:33:45 +02:00
  • 4c4c21342d don't try to decrypt nothing ansuz 2017-05-12 16:26:51 +02:00
  • 69e933dd17 better error handling in file download ansuz 2017-05-12 16:17:00 +02:00
  • 42f3a62cac handle errors with XHR ansuz 2017-05-12 16:13:09 +02:00
  • 213708d8dc center media tags ansuz 2017-05-12 15:43:32 +02:00
  • 6c68b5e6ca use new media-tag, listen for decryption events ansuz 2017-05-12 15:42:01 +02:00
  • fa4b17e2bc use callback in 'getLimit' ansuz 2017-05-12 15:39:55 +02:00
  • 77efc2cee7 bump version for upcoming release ansuz 2017-05-12 14:24:52 +02:00
  • 7dd5907ff0 Merge branch 'limit' into staging ansuz 2017-05-12 14:21:46 +02:00
  • a249435003 refactor limit handling a bit ansuz 2017-05-12 14:19:36 +02:00
  • 22efde87d5 correctly estimate upload size ansuz 2017-05-12 12:12:51 +02:00
  • a993ab6616 use new encrypted file encoding in media-tag ansuz 2017-05-12 11:25:07 +02:00
  • 8c49150725 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-12 10:54:32 +02:00
  • e0293a1162 Merge branch 'master' into staging yflory 2017-05-11 18:26:09 +02:00
  • d2ba8f1c27 Use the new format for the storage limits yflory 2017-05-11 18:07:29 +02:00
  • e123ad0333 Use a POST request to get the storage limits yflory 2017-05-11 16:31:14 +02:00
  • 57ee7de7d4 Update and return the storage limit yflory 2017-05-11 16:12:44 +02:00
  • 5348303df6 Bad code, lint failure Caleb James DeLisle 2017-05-11 16:02:24 +02:00
  • b2b1f08d01 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging Caleb James DeLisle 2017-05-11 15:54:27 +02:00
  • 9a6d63960b Added a script to get the amount of data which is pinned Caleb James DeLisle 2017-05-11 15:54:15 +02:00
  • d3854b9774 Fix selection issues in the drive with Chrome yflory 2017-05-10 11:44:58 +02:00
  • 371edff943 Fix an error when moving unsorted files to root in the drive yflory 2017-05-11 14:24:16 +02:00
  • b76dcba1d6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-11 12:43:49 +02:00
  • 733c3abefa Update the upgrade button in the drive yflory 2017-05-11 12:43:32 +02:00
  • becba33b05 Scroll to the selected element in the drive yflory 2017-05-11 12:11:45 +02:00
  • 419fb15425 Remember the scroll position in the drive tree yflory 2017-05-11 11:20:18 +02:00
  • 5d0535966c Center vertically slides in present mode and checkbox to disable transitions yflory 2017-05-11 10:58:33 +02:00
  • 5d37a50a87 try to estimate upload size ansuz 2017-05-10 18:57:25 +02:00
  • 6d30d7f89f strip junk bytes from base64 more safely ansuz 2017-05-10 18:15:33 +02:00
  • 1525712deb new encrypted file format ansuz 2017-05-10 17:13:14 +02:00
  • 8f5989b6b0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-10 17:05:13 +02:00
  • cf81b02096 Make sure the spinner is always centered in the loading screen yflory 2017-05-10 16:11:41 +02:00
  • 5a21be8112 Improve UI on mobile yflory 2017-05-10 15:54:09 +02:00
  • 5aba2d4640 remove unused variable ansuz 2017-05-10 15:36:34 +02:00
  • db2f7a5e36 add todos and change file id size ansuz 2017-05-10 15:36:14 +02:00
  • 5c8586f8a3 Fix typo in file upload yflory 2017-05-10 15:00:05 +02:00
  • 1e4fc5a979 lint yflory 2017-05-10 14:56:50 +02:00
  • 3c4b6a89d2 Fix a conflict with the arrow keys and renaming a folder in the tree yflory 2017-05-10 14:48:15 +02:00
  • 96ccb94397 Add the share button when a file upload is complete yflory 2017-05-10 14:44:01 +02:00
  • c00158d23a Move code to common-history yflory 2017-05-10 13:39:14 +02:00
  • 97a28d3938 test file encryption/decryption ansuz 2017-05-10 11:56:10 +02:00
  • 6a1c799a6e support async tests ansuz 2017-05-10 11:54:21 +02:00
  • 922e7803e9 remove extraneous slashes from hashes when parsing ansuz 2017-05-10 11:54:05 +02:00
  • 0f8ef2f516 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-10 11:45:25 +02:00
  • 6a8153aca3 Fix selection issues in the drive with Chrome yflory 2017-05-10 11:44:58 +02:00
  • a6c49cd65c Fix undefined title in slides present mode yflory 2017-05-10 10:49:59 +02:00
  • 299a53ded7 prefer to use functions from common ansuz 2017-05-09 18:54:56 +02:00
  • a338b23f40 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-09 18:36:27 +02:00
  • df47b913e3 fetch array buffers in cryptpad-common ansuz 2017-05-09 18:36:18 +02:00
  • ff16084719 Fix lint errors yflory 2017-05-09 18:10:02 +02:00
  • 50c8a859e6 Move the CodeMirror cursor code to common-codemirror yflory 2017-05-09 17:57:27 +02:00
  • 9eb8e55cf6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-09 17:48:07 +02:00
  • c79a6e3b2b Move Metadata, CodeMirror and title functions in separate files yflory 2017-05-09 17:47:47 +02:00
  • 56a871cb67 Merge branch 'soon' into staging ansuz 2017-05-09 16:50:54 +02:00
  • 521f99a3d6 support drag and drop for file upload ansuz 2017-05-09 16:50:25 +02:00
  • b4973b7610 Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2017-05-09 15:11:38 +02:00
  • ae7d65c3fa fix drag to select in chrome ansuz 2017-05-09 15:11:27 +02:00
  • 63710e1ccc Move the code related to the title in another file yflory 2017-05-09 12:45:18 +02:00
  • 48898c97e5 Merge branch 'master' of github.com:xwiki-labs/cryptpad yflory 2017-05-09 14:31:42 +02:00
  • ce5cdce917 Fix an issue where the username was lost on websocket reconnect yflory 2017-05-09 14:31:28 +02:00
  • 1d4d4cffdb correct some copypasted code ansuz 2017-05-09 14:26:17 +02:00
  • 2b4f503aff Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2017-05-09 11:55:31 +02:00