yflory
|
2b60b81a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
d13dde856a
|
Add the markdown renderer file and change code's default content
|
8 years ago |
ansuz
|
73ec91aa5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
7befaccd88
|
move more rpc calls into pinpad
|
8 years ago |
yflory
|
56bcdff890
|
Add a preview of the markdown content in the code editor
|
8 years ago |
yflory
|
b72415b56b
|
Fix old hashes not working with the new parser
|
8 years ago |
yflory
|
6b7aeb9121
|
Fix the text example
|
8 years ago |
yflory
|
fe0f21594a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
953e7155f0
|
Send only the hostname to the accounts server
|
8 years ago |
ansuz
|
afef456b18
|
fix undefined reference
|
8 years ago |
yflory
|
1a7c4d5ebe
|
Store the FS_hash in the user object after the merge
|
8 years ago |
yflory
|
87fa28180a
|
Display an upgrade button in the settings page
|
8 years ago |
yflory
|
c1b43db363
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
1542aa96bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
dc2cdb7c08
|
Add the usage bar in the settings page
|
8 years ago |
ansuz
|
2dd04f7631
|
get limits from the server
|
8 years ago |
yflory
|
8172f117a7
|
Fix Hash.alert not a function
|
8 years ago |
yflory
|
0e58859393
|
Fix lint error
|
8 years ago |
yflory
|
771348720b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
57979f6314
|
Display the public key using a href in the settings page
|
8 years ago |
ansuz
|
a9b670fdf5
|
don't parse trailing slash as part of encryption key in old hashes
|
8 years ago |
ansuz
|
06f3d0eefe
|
shim isArray if not exists. correctly report how often this occurs
|
8 years ago |
yflory
|
50d9f72b3a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
601226115b
|
New anonymous drive
|
8 years ago |
ansuz
|
30f6ef3f85
|
handle more response codes, use metadata
|
8 years ago |
ansuz
|
18d959ef16
|
handle non-200 status codes
|
8 years ago |
yflory
|
ed95bbb08f
|
Fix lint errors
|
8 years ago |
yflory
|
89a993be3c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
0f13198119
|
Move the parseHash code into parsePadUrl
|
8 years ago |
ansuz
|
42f3a62cac
|
handle errors with XHR
|
8 years ago |
ansuz
|
6c68b5e6ca
|
use new media-tag, listen for decryption events
|
8 years ago |
ansuz
|
7dd5907ff0
|
Merge branch 'limit' into staging
|
8 years ago |
ansuz
|
a993ab6616
|
use new encrypted file encoding in media-tag
|
8 years ago |
ansuz
|
8c49150725
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
e0293a1162
|
Merge branch 'master' into staging
|
8 years ago |
yflory
|
57ee7de7d4
|
Update and return the storage limit
|
8 years ago |
yflory
|
371edff943
|
Fix an error when moving unsorted files to root in the drive
|
8 years ago |
yflory
|
b76dcba1d6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
6d30d7f89f
|
strip junk bytes from base64 more safely
|
8 years ago |
ansuz
|
8f5989b6b0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
cf81b02096
|
Make sure the spinner is always centered in the loading screen
|
8 years ago |
yflory
|
5c8586f8a3
|
Fix typo in file upload
|
8 years ago |
yflory
|
96ccb94397
|
Add the share button when a file upload is complete
|
8 years ago |
yflory
|
c00158d23a
|
Move code to common-history
|
8 years ago |
ansuz
|
922e7803e9
|
remove extraneous slashes from hashes when parsing
|
8 years ago |
ansuz
|
a338b23f40
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
df47b913e3
|
fetch array buffers in cryptpad-common
|
8 years ago |
yflory
|
ff16084719
|
Fix lint errors
|
8 years ago |
yflory
|
50c8a859e6
|
Move the CodeMirror cursor code to common-codemirror
|
8 years ago |
yflory
|
9eb8e55cf6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
8 years ago |
yflory
|
63710e1ccc
|
Move the code related to the title in another file
|
8 years ago |
yflory
|
ce5cdce917
|
Fix an issue where the username was lost on websocket reconnect
|
8 years ago |
ansuz
|
42dcfb9661
|
unceremoniously kick web clients when you 'log out everywhere'
|
8 years ago |
yflory
|
9206d89531
|
Fix lint errors
|
8 years ago |
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
8 years ago |
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
8 years ago |
ansuz
|
3a338e0890
|
fix undefined reference
|
8 years ago |
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
8 years ago |
yflory
|
5a5b02b82b
|
Don't store in the drive pads without a hash
|
8 years ago |
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
8 years ago |
yflory
|
706120ae5b
|
Display images uploaded in the File app with the Media app
|
8 years ago |
yflory
|
28cb40d7ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
1b6fae4dd2
|
Update mediatag
|
8 years ago |
ansuz
|
a0c420af8e
|
jshint compliance
|
8 years ago |
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
78b11584f8
|
remove unused variables
|
8 years ago |
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a190c99426
|
Toolbar refactoring
|
8 years ago |
ansuz
|
7573b86946
|
call back with error if an RPC is made while disconnected
|
8 years ago |
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
8 years ago |
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
8 years ago |
ansuz
|
f2672d587a
|
fix variable redefinition
|
8 years ago |
ansuz
|
0e7eeb285c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
8 years ago |
ansuz
|
cf4dee28f7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
28e4ef1b13
|
WIP RPC code
|
8 years ago |
yflory
|
afb0061d7b
|
Fix an issue with anonymous user unable to store new pads
|
8 years ago |
yflory
|
56aaeea003
|
Fix the drive toolbar not displaying the displayName
|
8 years ago |
ansuz
|
3fa0a73025
|
prevent using string methods on undefined variable
|
8 years ago |
ansuz
|
1b3ce5aa96
|
fix typo
|
8 years ago |
yflory
|
a51a35da70
|
Fix an issue with hashes ending with a slash
|
8 years ago |
yflory
|
ef58120819
|
Prevent multiple concurrent clicks to get the history
|
8 years ago |
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
8 years ago |
yflory
|
c820b3485c
|
Fix function undefined when loading a template
|
8 years ago |
yflory
|
0ef1c14d7f
|
Fix lint errors
|
8 years ago |
yflory
|
fc760b4820
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
8 years ago |
ansuz
|
e51c7f9cf0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
8 years ago |
ansuz
|
aedc46bdaf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
a97e7223f1
|
implement getBlobPathFromHex
|
8 years ago |
yflory
|
520dabe094
|
Remove the unsorted files category
|
8 years ago |
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
8 years ago |
yflory
|
6a8274518b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
8 years ago |
ansuz
|
12898b3358
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
74bcec8b31
|
programming is hard okay
|
8 years ago |
yflory
|
2a417ddae8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |