 ansuz
|
b910915d47
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-29 11:33:03 +02:00 |
|
|
ansuz
|
6573813523
|
Merge branch 'soon' into staging
|
2017-05-29 11:32:54 +02:00 |
|
|
ansuz
|
3f3d64992d
|
resolve merge conflicts
|
2017-05-26 12:44:58 +02:00 |
|
|
ansuz
|
57017c68fa
|
hacks for cross-domain safari
|
2017-05-26 12:42:12 +02:00 |
|
|
ansuz
|
cf658c1b3a
|
backport live changes
|
2017-05-26 12:41:30 +02:00 |
|
|
ansuz
|
a04f179d8b
|
hide preview mode on phones
|
2017-05-24 19:00:14 +02:00 |
|
|
ansuz
|
dc2b0ae6b4
|
jshint compliance
|
2017-05-24 18:45:48 +02:00 |
|
|
ansuz
|
b32c329269
|
remember whether you were using preview mode for a pad
|
2017-05-24 18:41:19 +02:00 |
|
|
ansuz
|
d9f7470f06
|
copy user details into sessionStorage for safari
|
2017-05-24 18:28:16 +02:00 |
|
|
ansuz
|
a5ffd278a7
|
write styles for code in .less
|
2017-05-24 17:27:03 +02:00 |
|
|
ansuz
|
3803f6a20f
|
only render preview if preview container is visible
|
2017-05-24 17:25:33 +02:00 |
|
|
ansuz
|
617e027f12
|
catch markdown preview errors
|
2017-05-24 15:50:35 +02:00 |
|
|
ansuz
|
bc26f7fc4e
|
Merge branch 'soon' into staging
|
2017-05-24 15:04:40 +02:00 |
|
|
ansuz
|
c5bb830757
|
don't preview if hightlight mode is not markdown
|
2017-05-24 14:21:31 +02:00 |
|
|
ansuz
|
fd83ae3e61
|
implement createRandomInteger
|
2017-05-24 11:34:40 +02:00 |
|
|
ansuz
|
4d9060f49e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-24 11:28:06 +02:00 |
|
|
ansuz
|
378bf2aa94
|
yflory's word wrap fix
|
2017-05-24 11:27:31 +02:00 |
|
|
ansuz
|
dc80b6b11f
|
throttle markdown preview
|
2017-05-24 11:27:16 +02:00 |
|
|
ansuz
|
d49e6deffb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-23 18:06:39 +02:00 |
|
|
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 |
|
|
ansuz
|
6324d9bbb0
|
feedback on template feature usage
|
2017-05-23 14:54:40 +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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
ansuz
|
a99080fb74
|
push the rest of the code
|
2017-05-22 12:31: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 |
|
|
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 |
|
|
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 |
|
|
ansuz
|
7d369fb5e0
|
move rpc warnings out of server and into rpc
|
2017-05-19 14:37:00 +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 |
|
|
ansuz
|
d9f128e923
|
send appropriate responses to upload rpc calls
|
2017-05-19 09:12:39 +02:00 |
|
|
ansuz
|
d71e12713a
|
handle empty arrays when reducing
|
2017-05-19 09:11:28 +02:00 |
|
|
ansuz
|
e7a458295b
|
new translation keys for file upload
|
2017-05-19 09:10:36 +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 |
|
|
ansuz
|
164342920e
|
fix inverted condition
|
2017-05-18 15:39:24 +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 |
|
|
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
|
df1433b53f
|
don't pin if users don't have space.
better validation of rpc calls
|
2017-05-18 12:45:40 +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 |
|
|
ansuz
|
98828730b4
|
refactor more
|
2017-05-16 18:08:59 +02:00 |
|
|
ansuz
|
24eb928ef8
|
simplify rpc function signatures
|
2017-05-16 17:07:53 +02:00 |
|
|
ansuz
|
a97a6caf9b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-16 15:11:31 +02:00 |
|
|
ansuz
|
c381e85384
|
correctly identify users' limits by unescaped public key
|
2017-05-16 15:11:20 +02:00 |
|
|
ansuz
|
517438d7c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-16 14:33:34 +02:00 |
|
|
ansuz
|
81af9225fc
|
template a Romanian translation
|
2017-05-16 14:32:54 +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 |
|
|
ansuz
|
1542aa96bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 18:17:56 +02:00 |
|
|
ansuz
|
dfe3eac606
|
big rpc refactor:
* support pinning files
* include pinned files in usage calculation
* safer session handling
* fix bugs in limit update code
|
2017-05-15 18:12:10 +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 |
|
|
ansuz
|
591c5a7844
|
add TODOs, integrate upload size checks
|
2017-05-15 11:59:36 +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 |
|
|
ansuz
|
bef5aa0b2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 09:52:57 +02:00 |
|
|
ansuz
|
fc49715bc0
|
document 'enableFeedback' in the server conf
|
2017-05-13 12:32:26 +02:00 |
|
|
ansuz
|
3388724367
|
resolve merge conflicts
|
2017-05-12 17:40:35 +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 |
|
|
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
|
fa4b17e2bc
|
use callback in 'getLimit'
|
2017-05-12 15:39:55 +02:00 |
|
|
ansuz
|
77efc2cee7
|
bump version for upcoming release
|
2017-05-12 14:24:52 +02:00 |
|
|
ansuz
|
7dd5907ff0
|
Merge branch 'limit' into staging
|
2017-05-12 14:21:46 +02:00 |
|
|
ansuz
|
a249435003
|
refactor limit handling a bit
|
2017-05-12 14:19:36 +02:00 |
|