Commit Graph

  • 538aec6ef5 Display a message when pinPads returns an error yflory 2017-05-22 10:41:47 +0200
  • 03da870a7a jshint compliance ansuz 2017-05-19 19:38:57 +0200
  • af4fd3c6d3 resolve merge conflicts ansuz 2017-05-19 19:14:08 +0200
  • 67a04a16ec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-19 18:44:46 +0200
  • 1ab6eb3c5d Add a queue for multiple uploads in the file app yflory 2017-05-19 18:41:34 +0200
  • ba5ef5157e show pretty representations of storage usage ansuz 2017-05-19 18:37:31 +0200
  • 1378a0c1f6 serve blobs from configured location ansuz 2017-05-19 16:56:45 +0200
  • 0a54f0cf2d better alignment of preview and code entry ansuz 2017-05-19 16:21:26 +0200
  • 0d265f543e add file.css to npm style command ansuz 2017-05-19 14:41:55 +0200
  • 7d369fb5e0 move rpc warnings out of server and into rpc ansuz 2017-05-19 14:37:00 +0200
  • e78299aed6 use async file decryption, listen for progress events. ansuz 2017-05-19 11:46:47 +0200
  • bcd0303821 style /file/ with .less ansuz 2017-05-19 11:46:10 +0200
  • ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-19 09:13:38 +0200
  • 310909dc9e handle new error codes ansuz 2017-05-19 09:12:59 +0200
  • d9f128e923 send appropriate responses to upload rpc calls ansuz 2017-05-19 09:12:39 +0200
  • d71e12713a handle empty arrays when reducing ansuz 2017-05-19 09:11:28 +0200
  • e7a458295b new translation keys for file upload ansuz 2017-05-19 09:10:36 +0200
  • d014fccfce Fix lint error yflory 2017-05-18 18:52:14 +0200
  • 2082b328b4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-18 18:51:21 +0200
  • 814c81fb13 Display an alert when CryptPad has a new version yflory 2017-05-18 18:51:08 +0200
  • 34606ea8ba use newest xwiki media-tag ansuz 2017-05-18 18:24:24 +0200
  • 5a83259233 listen for decryption errors ansuz 2017-05-18 18:24:04 +0200
  • 2cee9534c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-18 17:58:33 +0200
  • d324a054f2 add progress bar to file upload ansuz 2017-05-18 17:57:42 +0200
  • 21f9e31e75 Add a placeholder for the user app yflory 2017-05-18 15:56:35 +0200
  • 164342920e fix inverted condition ansuz 2017-05-18 15:39:24 +0200
  • 620f4dc512 Add translations for the markdown preview button title yflory 2017-05-18 15:05:37 +0200
  • 51bd41d4e8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-18 14:57:12 +0200
  • 0bd4caeb7e Add the task list code to the markdown renderer yflory 2017-05-18 14:57:04 +0200
  • d187945e94 jshint compliance ansuz 2017-05-18 14:55:16 +0200
  • 3ba94a1ba2 correctly set release version number ansuz 2017-05-18 14:54:02 +0200
  • 2b60b81a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-18 14:27:10 +0200
  • d13dde856a Add the markdown renderer file and change code's default content yflory 2017-05-18 14:26:56 +0200
  • 4debec39bb update footer with next release codename and corrected matrix link ansuz 2017-05-18 12:58:49 +0200
  • 73ec91aa5e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-18 12:46:36 +0200
  • df1433b53f don't pin if users don't have space. ansuz 2017-05-18 12:45:40 +0200
  • 80479fdc90 use rpc calls from cryptpad common ansuz 2017-05-18 12:44:16 +0200
  • 7befaccd88 move more rpc calls into pinpad ansuz 2017-05-18 12:36:12 +0200
  • 56bcdff890 Add a preview of the markdown content in the code editor yflory 2017-05-18 12:16:26 +0200
  • b72415b56b Fix old hashes not working with the new parser yflory 2017-05-18 10:13:08 +0200
  • 6ad0fdff79 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-17 15:48:24 +0200
  • 6b7aeb9121 Fix the text example yflory 2017-05-17 15:48:09 +0200
  • 98828730b4 refactor more ansuz 2017-05-16 18:08:59 +0200
  • 24eb928ef8 simplify rpc function signatures ansuz 2017-05-16 17:07:53 +0200
  • a97a6caf9b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-16 15:11:31 +0200
  • c381e85384 correctly identify users' limits by unescaped public key ansuz 2017-05-16 15:11:20 +0200
  • fe0f21594a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-16 14:41:51 +0200
  • 953e7155f0 Send only the hostname to the accounts server yflory 2017-05-16 14:41:40 +0200
  • 517438d7c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-16 14:33:34 +0200
  • 81af9225fc template a Romanian translation ansuz 2017-05-16 14:32:54 +0200
  • e8275c02c6 Merge pull request #115 from pbondoer/spanish ansuz 2017-05-16 14:23:06 +0200
  • afef456b18 fix undefined reference ansuz 2017-05-16 14:15:42 +0200
  • 8fe0282b7b jshint compliance ansuz 2017-05-16 14:14:30 +0200
  • ad6217f064
    file upload spanish keys Pierre Bondoerffer 2017-05-16 14:05:36 +0200
  • 827233dcba new translation keys for file upload ansuz 2017-05-16 14:01:06 +0200
  • 834830fc4f Fix the Ctrl key + click to select multiple files yflory 2017-05-16 11:25:51 +0200
  • 1a7c4d5ebe Store the FS_hash in the user object after the merge yflory 2017-05-16 11:25:37 +0200
  • 87fa28180a Display an upgrade button in the settings page yflory 2017-05-16 10:34:50 +0200
  • c1b43db363 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-15 18:21:25 +0200
  • 7ee6864ea4 Add the user menu in the login and register pages yflory 2017-05-15 18:21:11 +0200
  • 1542aa96bc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-15 18:17:56 +0200
  • dc2cdb7c08 Add the usage bar in the settings page yflory 2017-05-15 18:16:22 +0200
  • dfe3eac606 big rpc refactor: ansuz 2017-05-15 18:12:10 +0200
  • cc893723de add some TODOs, log uploaded content so we know it's working ansuz 2017-05-15 18:10:22 +0200
  • 2dd04f7631 get limits from the server ansuz 2017-05-15 18:03:12 +0200
  • 716245f864 Make all the buttons look the same yflory 2017-05-15 16:16:50 +0200
  • 0f37d9def7 Change the button font size in the toolbar yflory 2017-05-15 14:53:51 +0200
  • 48496416e7 Use the same font-size for all the toolbar buttons yflory 2017-05-15 14:46:17 +0200
  • 8172f117a7 Fix Hash.alert not a function yflory 2017-05-15 14:21:15 +0200
  • 0e58859393 Fix lint error yflory 2017-05-15 13:55:40 +0200
  • 771348720b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-15 13:54:25 +0200
  • 03274c3776 Display an info message in the anonymous drive yflory 2017-05-15 13:54:03 +0200
  • 57979f6314 Display the public key using a href in the settings page yflory 2017-05-15 13:53:43 +0200
  • ad5e18f558
    Spanish update Pierre Bondoerffer 2017-05-15 12:05:50 +0200
  • 591c5a7844 add TODOs, integrate upload size checks ansuz 2017-05-15 11:59:36 +0200
  • a9b670fdf5 don't parse trailing slash as part of encryption key in old hashes ansuz 2017-05-15 11:17:46 +0200
  • 9bbd3161ca update tests for new API changes ansuz 2017-05-15 11:11:12 +0200
  • 06f3d0eefe shim isArray if not exists. correctly report how often this occurs ansuz 2017-05-15 10:26:52 +0200
  • bef5aa0b2b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-15 09:52:57 +0200
  • fc49715bc0 document 'enableFeedback' in the server conf ansuz 2017-05-13 12:32:26 +0200
  • 50d9f72b3a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-12 18:06:37 +0200
  • 601226115b New anonymous drive yflory 2017-05-12 18:06:29 +0200
  • 3388724367 resolve merge conflicts ansuz 2017-05-12 17:40:35 +0200
  • 30f6ef3f85 handle more response codes, use metadata ansuz 2017-05-12 17:34:29 +0200
  • 18d959ef16 handle non-200 status codes ansuz 2017-05-12 17:07:30 +0200
  • ed95bbb08f Fix lint errors yflory 2017-05-12 16:43:01 +0200
  • 89a993be3c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-12 16:33:56 +0200
  • 0f13198119 Move the parseHash code into parsePadUrl yflory 2017-05-12 16:33:45 +0200
  • 4c4c21342d don't try to decrypt nothing ansuz 2017-05-12 16:26:51 +0200
  • 69e933dd17 better error handling in file download ansuz 2017-05-12 16:17:00 +0200
  • 42f3a62cac handle errors with XHR ansuz 2017-05-12 16:13:09 +0200
  • 213708d8dc center media tags ansuz 2017-05-12 15:43:32 +0200
  • 6c68b5e6ca use new media-tag, listen for decryption events ansuz 2017-05-12 15:42:01 +0200
  • fa4b17e2bc use callback in 'getLimit' ansuz 2017-05-12 15:39:55 +0200
  • 77efc2cee7 bump version for upcoming release ansuz 2017-05-12 14:24:52 +0200
  • 7dd5907ff0 Merge branch 'limit' into staging ansuz 2017-05-12 14:21:46 +0200
  • a249435003 refactor limit handling a bit ansuz 2017-05-12 14:19:36 +0200
  • 22efde87d5 correctly estimate upload size ansuz 2017-05-12 12:12:51 +0200
  • a993ab6616 use new encrypted file encoding in media-tag ansuz 2017-05-12 11:25:07 +0200
  • 8c49150725 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-12 10:54:32 +0200