ansuz
|
ba5ef5157e
|
show pretty representations of storage usage
|
2017-05-19 18:37:31 +02:00 |
|
ansuz
|
e78299aed6
|
use async file decryption, listen for progress events.
|
2017-05-19 11:46:47 +02:00 |
|
ansuz
|
ef155d8ccf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-19 09:13:38 +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
|
2cee9534c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 17:58:33 +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 |
|
yflory
|
2b60b81a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 14:27:10 +02:00 |
|
yflory
|
d13dde856a
|
Add the markdown renderer file and change code's default content
|
2017-05-18 14:26:56 +02:00 |
|
ansuz
|
73ec91aa5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 12:46:36 +02:00 |
|
ansuz
|
7befaccd88
|
move more rpc calls into pinpad
|
2017-05-18 12:36:12 +02:00 |
|
yflory
|
56bcdff890
|
Add a preview of the markdown content in the code editor
|
2017-05-18 12:16:26 +02:00 |
|
yflory
|
b72415b56b
|
Fix old hashes not working with the new parser
|
2017-05-18 10:13:08 +02:00 |
|
yflory
|
6b7aeb9121
|
Fix the text example
|
2017-05-17 15:48:09 +02:00 |
|
yflory
|
fe0f21594a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-16 14:41:51 +02:00 |
|
yflory
|
953e7155f0
|
Send only the hostname to the accounts server
|
2017-05-16 14:41:40 +02:00 |
|
ansuz
|
afef456b18
|
fix undefined reference
|
2017-05-16 14:15:42 +02:00 |
|
yflory
|
1a7c4d5ebe
|
Store the FS_hash in the user object after the merge
|
2017-05-16 11:25:37 +02:00 |
|
yflory
|
87fa28180a
|
Display an upgrade button in the settings page
|
2017-05-16 10:34:50 +02:00 |
|
yflory
|
c1b43db363
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 18:21:25 +02:00 |
|
ansuz
|
1542aa96bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 18:17:56 +02:00 |
|
yflory
|
dc2cdb7c08
|
Add the usage bar in the settings page
|
2017-05-15 18:16:22 +02:00 |
|
ansuz
|
2dd04f7631
|
get limits from the server
|
2017-05-15 18:03:12 +02:00 |
|
yflory
|
8172f117a7
|
Fix Hash.alert not a function
|
2017-05-15 14:21:15 +02:00 |
|
yflory
|
0e58859393
|
Fix lint error
|
2017-05-15 13:55:40 +02:00 |
|
yflory
|
771348720b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 13:54:25 +02:00 |
|
yflory
|
57979f6314
|
Display the public key using a href in the settings page
|
2017-05-15 13:53:43 +02:00 |
|
ansuz
|
a9b670fdf5
|
don't parse trailing slash as part of encryption key in old hashes
|
2017-05-15 11:17:46 +02:00 |
|
ansuz
|
06f3d0eefe
|
shim isArray if not exists. correctly report how often this occurs
|
2017-05-15 10:26:52 +02:00 |
|
yflory
|
50d9f72b3a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-12 18:06:37 +02:00 |
|
yflory
|
601226115b
|
New anonymous drive
|
2017-05-12 18:06:29 +02:00 |
|
ansuz
|
30f6ef3f85
|
handle more response codes, use metadata
|
2017-05-12 17:34:29 +02:00 |
|
ansuz
|
18d959ef16
|
handle non-200 status codes
|
2017-05-12 17:07:30 +02:00 |
|
yflory
|
ed95bbb08f
|
Fix lint errors
|
2017-05-12 16:43:01 +02:00 |
|
yflory
|
89a993be3c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-12 16:33:56 +02:00 |
|
yflory
|
0f13198119
|
Move the parseHash code into parsePadUrl
|
2017-05-12 16:33:45 +02:00 |
|
ansuz
|
42f3a62cac
|
handle errors with XHR
|
2017-05-12 16:13:09 +02:00 |
|
ansuz
|
6c68b5e6ca
|
use new media-tag, listen for decryption events
|
2017-05-12 15:42:01 +02:00 |
|
ansuz
|
7dd5907ff0
|
Merge branch 'limit' into staging
|
2017-05-12 14:21:46 +02:00 |
|
ansuz
|
a993ab6616
|
use new encrypted file encoding in media-tag
|
2017-05-12 11:25:07 +02:00 |
|
ansuz
|
8c49150725
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-12 10:54:32 +02:00 |
|
yflory
|
e0293a1162
|
Merge branch 'master' into staging
|
2017-05-11 18:26:09 +02:00 |
|
yflory
|
57ee7de7d4
|
Update and return the storage limit
|
2017-05-11 16:12:44 +02:00 |
|
yflory
|
371edff943
|
Fix an error when moving unsorted files to root in the drive
|
2017-05-11 14:24:16 +02:00 |