Commit graph

1698 commits

Author SHA1 Message Date
ansuz
6faca87e73 set preview content in read only mode 2017-05-23 15:54:04 +02:00
ansuz
6324d9bbb0 feedback on template feature usage 2017-05-23 14:54:40 +02:00
yflory
c3437382fb Fix the release version in the what's new popup 2017-05-23 11:22:32 +02:00
ansuz
4fae1b16c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 18:43:14 +02:00
ansuz
70cae0d2c3 safely access pin reset response 2017-05-22 18:43:06 +02:00
yflory
a50805545d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 17:56:49 +02:00
yflory
d55b7e411c Display an alert in the drive when the limit is reached 2017-05-22 17:56:27 +02:00
ansuz
dac9d0647d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 16:39:27 +02:00
ansuz
259d34b7c8 jshint compliance 2017-05-22 16:34:22 +02:00
yflory
40b99e7bbf Get the file name before downloading the entire file 2017-05-22 15:30:59 +02:00
ansuz
6dc3c62ba4 check for src before trying to ajax 2017-05-22 15:12:39 +02:00
ansuz
a6cf761172 don't store media tag pages in the drive 2017-05-22 14:45:14 +02:00
yflory
90a9764fa4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 14:41:23 +02:00
yflory
346c289204 Fix lint errors 2017-05-22 14:39:58 +02:00
ansuz
71dc0af6c7 better test for success error codes 2017-05-22 14:37:57 +02:00
ansuz
0b6c587e2b fetch and decrypt metadata with range requests 2017-05-22 14:37:38 +02:00
yflory
eb31d0323c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 12:32:10 +02:00
ansuz
a99080fb74 push the rest of the code 2017-05-22 12:31:00 +02:00
yflory
408a4dad94 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 12:30:08 +02:00
yflory
3964f4feee Display the progress when downloading a file 2017-05-22 12:30:00 +02:00
ansuz
dd73ad2dd5 add decryptMetadata function 2017-05-22 12:26:44 +02:00
ansuz
5179252d3b fix merge conflicts 2017-05-22 12:11:24 +02:00
ansuz
4ee42b87d4 make file crypto great again 2017-05-22 12:04:47 +02:00
yflory
c45f08f147 Use a download button instead of downloading a file automatically 2017-05-22 11:43:45 +02:00
yflory
0c2f84058b Improve css for the file app 2017-05-22 11:16:01 +02:00
yflory
9c00a730f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-22 10:41:55 +02:00
yflory
538aec6ef5 Display a message when pinPads returns an error 2017-05-22 10:41:47 +02:00
ansuz
03da870a7a jshint compliance 2017-05-19 19:38:57 +02:00
ansuz
af4fd3c6d3 resolve merge conflicts 2017-05-19 19:14:08 +02:00
yflory
67a04a16ec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-19 18:44:46 +02:00
yflory
1ab6eb3c5d Add a queue for multiple uploads in the file app 2017-05-19 18:41:34 +02:00
ansuz
ba5ef5157e show pretty representations of storage usage 2017-05-19 18:37:31 +02:00
ansuz
0a54f0cf2d better alignment of preview and code entry 2017-05-19 16:21:26 +02:00
ansuz
e78299aed6 use async file decryption, listen for progress events. 2017-05-19 11:46:47 +02:00
ansuz
bcd0303821 style /file/ with .less 2017-05-19 11:46:10 +02:00
ansuz
ef155d8ccf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-19 09:13:38 +02:00
ansuz
310909dc9e handle new error codes 2017-05-19 09:12:59 +02:00
yflory
d014fccfce Fix lint error 2017-05-18 18:52:14 +02:00
yflory
2082b328b4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 18:51:21 +02:00
yflory
814c81fb13 Display an alert when CryptPad has a new version 2017-05-18 18:51:08 +02:00
ansuz
34606ea8ba use newest xwiki media-tag 2017-05-18 18:24:24 +02:00
ansuz
5a83259233 listen for decryption errors 2017-05-18 18:24:04 +02:00
ansuz
2cee9534c5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 17:58:33 +02:00
ansuz
d324a054f2 add progress bar to file upload 2017-05-18 17:57:42 +02:00
yflory
21f9e31e75 Add a placeholder for the user app 2017-05-18 15:56:35 +02:00
ansuz
164342920e fix inverted condition 2017-05-18 15:39:24 +02:00
yflory
620f4dc512 Add translations for the markdown preview button title 2017-05-18 15:05:37 +02:00
yflory
51bd41d4e8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-18 14:57:12 +02:00
yflory
0bd4caeb7e Add the task list code to the markdown renderer 2017-05-18 14:57:04 +02:00
ansuz
d187945e94 jshint compliance 2017-05-18 14:55:16 +02:00