Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• e6c04ccb49 bump server after paying for an account ansuz 2017-05-23 16:11:07 +02:00
• 6faca87e73 set preview content in read only mode ansuz 2017-05-23 15:54:04 +02:00
• b1b7da862b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-23 15:04:31 +02:00
• b281d51d90 Fix typos in the french translation yflory 2017-05-23 15:04:18 +02:00
• 6324d9bbb0 feedback on template feature usage ansuz 2017-05-23 14:54:40 +02:00
• 38bd6b3808 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-23 14:50:42 +02:00
• 964d046154 Update a french translation key yflory 2017-05-23 14:50:28 +02:00
• cf83cab596 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-23 12:35:54 +02:00
• 0a646a9534 remove unnecessary space ansuz 2017-05-23 12:35:49 +02:00
• 6ddfe0e901 Fix new lines in /pad userlist yflory 2017-05-23 12:14:31 +02:00
• ed5b005216 Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2017-05-23 11:47:09 +02:00
• 91ba41b8e8 hotfix for account ids ansuz 2017-05-23 11:46:59 +02:00
• c3437382fb Fix the release version in the what's new popup yflory 2017-05-23 11:22:32 +02:00
• 4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-22 18:43:14 +02:00
• 70cae0d2c3 safely access pin reset response ansuz 2017-05-22 18:43:06 +02:00
• a50805545d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 17:56:49 +02:00
• d55b7e411c Display an alert in the drive when the limit is reached yflory 2017-05-22 17:55:10 +02:00
• 2ca6277660 enable pin limits by default ansuz 2017-05-22 16:50:32 +02:00
• 6d38a5abc1 add new variables to example config ansuz 2017-05-22 16:49:50 +02:00
• dac9d0647d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-22 16:39:27 +02:00
• 259d34b7c8 jshint compliance ansuz 2017-05-22 16:34:22 +02:00
• ff8701b6ba send note along with limit ansuz 2017-05-22 15:56:24 +02:00
• 40b99e7bbf Get the file name before downloading the entire file yflory 2017-05-22 15:30:59 +02:00
• 6dc3c62ba4 check for src before trying to ajax ansuz 2017-05-22 15:12:39 +02:00
• a6cf761172 don't store media tag pages in the drive ansuz 2017-05-22 14:45:14 +02:00
• 90a9764fa4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 14:41:23 +02:00
• 346c289204 Fix lint errors yflory 2017-05-22 14:39:58 +02:00
• 71dc0af6c7 better test for success error codes ansuz 2017-05-22 14:37:57 +02:00
• 0b6c587e2b fetch and decrypt metadata with range requests ansuz 2017-05-22 14:37:38 +02:00
• eb31d0323c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 12:32:10 +02:00
• a99080fb74 push the rest of the code ansuz 2017-05-22 12:31:00 +02:00
• 408a4dad94 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 12:30:08 +02:00
• 3964f4feee Display the progress when downloading a file yflory 2017-05-22 12:30:00 +02:00
• dd73ad2dd5 add decryptMetadata function ansuz 2017-05-22 12:26:44 +02:00
• 5179252d3b fix merge conflicts ansuz 2017-05-22 12:11:24 +02:00
• 6e7fe87974 WIP debug file upload errors. use better error strings ansuz 2017-05-22 12:06:29 +02:00
• 4ee42b87d4 make file crypto great again ansuz 2017-05-22 12:04:47 +02:00
• c45f08f147 Use a download button instead of downloading a file automatically yflory 2017-05-22 11:43:45 +02:00
• 0c2f84058b Improve css for the file app yflory 2017-05-22 11:16:01 +02:00
• 9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-22 10:41:55 +02:00
• 538aec6ef5 Display a message when pinPads returns an error yflory 2017-05-22 10:41:47 +02:00
• 03da870a7a jshint compliance ansuz 2017-05-19 19:38:57 +02:00
• af4fd3c6d3 resolve merge conflicts ansuz 2017-05-19 19:14:08 +02:00
• 67a04a16ec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-19 18:44:46 +02:00
• 1ab6eb3c5d Add a queue for multiple uploads in the file app yflory 2017-05-19 18:41:34 +02:00
• ba5ef5157e show pretty representations of storage usage ansuz 2017-05-19 18:37:31 +02:00
• 1378a0c1f6 serve blobs from configured location ansuz 2017-05-19 16:56:45 +02:00
• 0a54f0cf2d better alignment of preview and code entry ansuz 2017-05-19 16:21:26 +02:00
• 0d265f543e add file.css to npm style command ansuz 2017-05-19 14:41:55 +02:00
• 7d369fb5e0 move rpc warnings out of server and into rpc ansuz 2017-05-19 14:37:00 +02:00
• e78299aed6 use async file decryption, listen for progress events. ansuz 2017-05-19 11:46:47 +02:00
• bcd0303821 style /file/ with .less ansuz 2017-05-19 11:46:10 +02:00
• ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-19 09:13:38 +02:00
• 310909dc9e handle new error codes ansuz 2017-05-19 09:12:59 +02:00
• d9f128e923 send appropriate responses to upload rpc calls ansuz 2017-05-19 09:12:39 +02:00
• d71e12713a handle empty arrays when reducing ansuz 2017-05-19 09:11:28 +02:00
• e7a458295b new translation keys for file upload ansuz 2017-05-19 09:10:36 +02:00
• d014fccfce Fix lint error yflory 2017-05-18 18:52:14 +02:00
• 2082b328b4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-18 18:51:21 +02:00
• 814c81fb13 Display an alert when CryptPad has a new version yflory 2017-05-18 18:51:08 +02:00
• 34606ea8ba use newest xwiki media-tag ansuz 2017-05-18 18:24:24 +02:00
• 5a83259233 listen for decryption errors ansuz 2017-05-18 18:24:04 +02:00
• 2cee9534c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-18 17:58:33 +02:00
• d324a054f2 add progress bar to file upload ansuz 2017-05-18 17:57:42 +02:00
• 21f9e31e75 Add a placeholder for the user app yflory 2017-05-18 15:56:35 +02:00
• 164342920e fix inverted condition ansuz 2017-05-18 15:39:24 +02:00
• 620f4dc512 Add translations for the markdown preview button title yflory 2017-05-18 15:05:37 +02:00
• 51bd41d4e8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-18 14:57:12 +02:00
• 0bd4caeb7e Add the task list code to the markdown renderer yflory 2017-05-18 14:57:04 +02:00
• d187945e94 jshint compliance ansuz 2017-05-18 14:55:16 +02:00
• 3ba94a1ba2 correctly set release version number ansuz 2017-05-18 14:54:02 +02:00
• 2b60b81a68 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-18 14:27:10 +02:00
• d13dde856a Add the markdown renderer file and change code's default content yflory 2017-05-18 14:26:56 +02:00
• 4debec39bb update footer with next release codename and corrected matrix link ansuz 2017-05-18 12:58:49 +02:00
• 73ec91aa5e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-18 12:46:36 +02:00
• df1433b53f don't pin if users don't have space. ansuz 2017-05-18 12:45:40 +02:00
• 80479fdc90 use rpc calls from cryptpad common ansuz 2017-05-18 12:44:16 +02:00
• 7befaccd88 move more rpc calls into pinpad ansuz 2017-05-18 12:36:12 +02:00
• 56bcdff890 Add a preview of the markdown content in the code editor yflory 2017-05-18 12:16:26 +02:00
• b72415b56b Fix old hashes not working with the new parser yflory 2017-05-18 10:13:08 +02:00
• 6ad0fdff79 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-17 15:48:24 +02:00
• 6b7aeb9121 Fix the text example yflory 2017-05-17 15:48:09 +02:00
• 98828730b4 refactor more ansuz 2017-05-16 18:08:59 +02:00
• 24eb928ef8 simplify rpc function signatures ansuz 2017-05-16 17:07:53 +02:00
• a97a6caf9b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-16 15:11:31 +02:00
• c381e85384 correctly identify users' limits by unescaped public key ansuz 2017-05-16 15:11:20 +02:00
• fe0f21594a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2017-05-16 14:41:51 +02:00
• 953e7155f0 Send only the hostname to the accounts server yflory 2017-05-16 14:41:40 +02:00
• 517438d7c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2017-05-16 14:33:34 +02:00
• 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