ansuz
|
4ee42b87d4
|
make file crypto great again
|
2017-05-22 12:04: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 |
ansuz
|
3ba94a1ba2
|
correctly set release version number
|
2017-05-18 14:54:02 +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
|
4debec39bb
|
update footer with next release codename and corrected matrix link
|
2017-05-18 12:58:49 +02:00 |
ansuz
|
73ec91aa5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 12:46:36 +02:00 |
ansuz
|
80479fdc90
|
use rpc calls from cryptpad common
|
2017-05-18 12:44:16 +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 |
ansuz
|
8fe0282b7b
|
jshint compliance
|
2017-05-16 14:14:30 +02:00 |
ansuz
|
827233dcba
|
new translation keys for file upload
|
2017-05-16 14:01:06 +02:00 |
yflory
|
834830fc4f
|
Fix the Ctrl key + click to select multiple files
|
2017-05-16 11:26:04 +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 |
yflory
|
7ee6864ea4
|
Add the user menu in the login and register pages
|
2017-05-15 18:21:11 +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
|
cc893723de
|
add some TODOs, log uploaded content so we know it's working
|
2017-05-15 18:10:22 +02:00 |
ansuz
|
2dd04f7631
|
get limits from the server
|
2017-05-15 18:03:12 +02:00 |
yflory
|
716245f864
|
Make all the buttons look the same
|
2017-05-15 16:16:50 +02:00 |
yflory
|
0f37d9def7
|
Change the button font size in the toolbar
|
2017-05-15 14:53:51 +02:00 |