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 |
|
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 |
|
yflory
|
48496416e7
|
Use the same font-size for all the toolbar buttons
|
2017-05-15 14:46:17 +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
|
03274c3776
|
Display an info message in the anonymous drive
|
2017-05-15 13:54:03 +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
|
9bbd3161ca
|
update tests for new API changes
|
2017-05-15 11:11:12 +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
|
4c4c21342d
|
don't try to decrypt nothing
|
2017-05-12 16:26:51 +02:00 |
|
ansuz
|
69e933dd17
|
better error handling in file download
|
2017-05-12 16:17:10 +02:00 |
|
ansuz
|
42f3a62cac
|
handle errors with XHR
|
2017-05-12 16:13:09 +02:00 |
|
ansuz
|
213708d8dc
|
center media tags
|
2017-05-12 15:43:32 +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
|
22efde87d5
|
correctly estimate upload size
|
2017-05-12 12:12:51 +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
|
d3854b9774
|
Fix selection issues in the drive with Chrome
|
2017-05-11 14:31:15 +02:00 |
|
yflory
|
371edff943
|
Fix an error when moving unsorted files to root in the drive
|
2017-05-11 14:24:16 +02:00 |
|
yflory
|
b76dcba1d6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-11 12:43:49 +02:00 |
|
yflory
|
733c3abefa
|
Update the upgrade button in the drive
|
2017-05-11 12:43:32 +02:00 |
|
yflory
|
becba33b05
|
Scroll to the selected element in the drive
|
2017-05-11 12:11:45 +02:00 |
|
yflory
|
419fb15425
|
Remember the scroll position in the drive tree
|
2017-05-11 11:20:18 +02:00 |
|
yflory
|
5d0535966c
|
Center vertically slides in present mode and checkbox to disable transitions
|
2017-05-11 10:58:33 +02:00 |
|
ansuz
|
5d37a50a87
|
try to estimate upload size
|
2017-05-10 18:57:25 +02:00 |
|
ansuz
|
6d30d7f89f
|
strip junk bytes from base64 more safely
|
2017-05-10 18:15:33 +02:00 |
|
ansuz
|
1525712deb
|
new encrypted file format
|
2017-05-10 17:13:26 +02:00 |
|
ansuz
|
8f5989b6b0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-10 17:05:13 +02:00 |
|
yflory
|
cf81b02096
|
Make sure the spinner is always centered in the loading screen
|
2017-05-10 16:11:41 +02:00 |
|
yflory
|
5a21be8112
|
Improve UI on mobile
|
2017-05-10 15:54:09 +02:00 |
|
ansuz
|
5aba2d4640
|
remove unused variable
|
2017-05-10 15:36:34 +02:00 |
|
yflory
|
5c8586f8a3
|
Fix typo in file upload
|
2017-05-10 15:00:05 +02:00 |
|
yflory
|
1e4fc5a979
|
lint
|
2017-05-10 14:56:50 +02:00 |
|
yflory
|
3c4b6a89d2
|
Fix a conflict with the arrow keys and renaming a folder in the tree
|
2017-05-10 14:48:15 +02:00 |
|
yflory
|
96ccb94397
|
Add the share button when a file upload is complete
|
2017-05-10 14:44:01 +02:00 |
|
yflory
|
c00158d23a
|
Move code to common-history
|
2017-05-10 13:39:14 +02:00 |
|
ansuz
|
97a28d3938
|
test file encryption/decryption
|
2017-05-10 11:56:10 +02:00 |
|
ansuz
|
6a1c799a6e
|
support async tests
|
2017-05-10 11:54:21 +02:00 |
|
ansuz
|
922e7803e9
|
remove extraneous slashes from hashes when parsing
|
2017-05-10 11:54:05 +02:00 |
|
yflory
|
0f8ef2f516
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-10 11:45:25 +02:00 |
|
yflory
|
6a8153aca3
|
Fix selection issues in the drive with Chrome
|
2017-05-10 11:44:58 +02:00 |
|
yflory
|
a6c49cd65c
|
Fix undefined title in slides present mode
|
2017-05-10 10:49:59 +02:00 |
|
ansuz
|
299a53ded7
|
prefer to use functions from common
|
2017-05-09 18:54:56 +02:00 |
|
ansuz
|
a338b23f40
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-09 18:36:27 +02:00 |
|
ansuz
|
df47b913e3
|
fetch array buffers in cryptpad-common
|
2017-05-09 18:36:18 +02:00 |
|
yflory
|
ff16084719
|
Fix lint errors
|
2017-05-09 18:10:02 +02:00 |
|
yflory
|
50c8a859e6
|
Move the CodeMirror cursor code to common-codemirror
|
2017-05-09 17:57:27 +02:00 |
|
yflory
|
9eb8e55cf6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-09 17:48:07 +02:00 |
|
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
2017-05-09 17:47:47 +02:00 |
|
ansuz
|
56a871cb67
|
Merge branch 'soon' into staging
|
2017-05-09 16:50:54 +02:00 |
|
ansuz
|
521f99a3d6
|
support drag and drop for file upload
|
2017-05-09 16:50:25 +02:00 |
|
ansuz
|
b4973b7610
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-05-09 15:11:38 +02:00 |
|
ansuz
|
ae7d65c3fa
|
fix drag to select in chrome
|
2017-05-09 15:11:27 +02:00 |
|
yflory
|
63710e1ccc
|
Move the code related to the title in another file
|
2017-05-09 14:32:41 +02:00 |
|
yflory
|
48898c97e5
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-05-09 14:31:42 +02:00 |
|
yflory
|
ce5cdce917
|
Fix an issue where the username was lost on websocket reconnect
|
2017-05-09 14:31:28 +02:00 |
|
ansuz
|
1d4d4cffdb
|
correct some copypasted code
|
2017-05-09 14:26:17 +02:00 |
|
ansuz
|
2b4f503aff
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-05-09 11:55:31 +02:00 |
|
ansuz
|
4a104052b4
|
handle errors in file
|
2017-05-09 11:55:25 +02:00 |
|
yflory
|
b818fd8a37
|
Fix 'undefined' error with the context menu
|
2017-05-09 11:20:06 +02:00 |
|
yflory
|
c34c1cb07c
|
Press enter to open a folder
|
2017-05-09 11:03:47 +02:00 |
|
ansuz
|
7da01d0862
|
unlist removed examples
|
2017-05-09 08:08:00 +02:00 |
|
ansuz
|
ea3dc8a852
|
remove file upload test
|
2017-05-09 08:05:20 +02:00 |
|
ansuz
|
42dcfb9661
|
unceremoniously kick web clients when you 'log out everywhere'
|
2017-05-05 18:25:55 +02:00 |
|
yflory
|
1547063b7f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 18:13:31 +02:00 |
|
yflory
|
a20a319a7a
|
Fix focus issues in the CryptDrive search bar
|
2017-05-05 18:13:14 +02:00 |
|
ansuz
|
36ab38f3ac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 17:58:33 +02:00 |
|
yflory
|
9206d89531
|
Fix lint errors
|
2017-05-05 17:58:32 +02:00 |