Commit graph

2533 commits

Author SHA1 Message Date
ansuz
97cc4a6d54 add styling for tables in markdown preview 2017-05-23 18:03:35 +02:00
ansuz
e6c04ccb49 bump server after paying for an account 2017-05-23 16:11:07 +02:00
ansuz
6faca87e73 set preview content in read only mode 2017-05-23 15:54:04 +02:00
yflory
b1b7da862b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 15:04:31 +02:00
yflory
b281d51d90 Fix typos in the french translation 2017-05-23 15:04:18 +02:00
ansuz
6324d9bbb0 feedback on template feature usage 2017-05-23 14:54:40 +02:00
yflory
38bd6b3808 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 14:50:42 +02:00
yflory
964d046154 Update a french translation key 2017-05-23 14:50:28 +02:00
ansuz
cf83cab596 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-05-23 12:35:54 +02:00
ansuz
0a646a9534 remove unnecessary space 2017-05-23 12:35:49 +02:00
yflory
6ddfe0e901 Fix new lines in /pad userlist 2017-05-23 12:14:31 +02:00
ansuz
ed5b005216 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-05-23 11:47:09 +02:00
ansuz
91ba41b8e8 hotfix for account ids 2017-05-23 11:46:59 +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
2ca6277660 enable pin limits by default 2017-05-22 16:50:32 +02:00
ansuz
6d38a5abc1 add new variables to example config 2017-05-22 16:49:50 +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
ansuz
ff8701b6ba send note along with limit 2017-05-22 15:56:24 +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
6e7fe87974 WIP debug file upload errors. use better error strings 2017-05-22 12:06:29 +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
1378a0c1f6 serve blobs from configured location 2017-05-19 17:01:09 +02:00
ansuz
0a54f0cf2d better alignment of preview and code entry 2017-05-19 16:21:26 +02:00
ansuz
0d265f543e add file.css to npm style command 2017-05-19 14:41:55 +02:00