Pierre Bondoerffer
|
b6bb576a34
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
|
8 years ago |
|
Caleb James DeLisle
|
66520b6041
|
cleaned up the accounts, limits and revenue sharing and unified the config in one place
|
8 years ago |
|
Pierre Bondoerffer
|
1092285a68
|
merge master
|
8 years ago |
|
Caleb James DeLisle
|
6c1861dbc6
|
Merge branch 'soon' into staging
|
8 years ago |
|
Caleb James DeLisle
|
2ecf257fcd
|
Sync localStorage with sessionStorage in auth because safari...
|
8 years ago |
|
ansuz
|
3f3d64992d
|
resolve merge conflicts
|
8 years ago |
|
ansuz
|
57017c68fa
|
hacks for cross-domain safari
|
8 years ago |
|
ansuz
|
cf658c1b3a
|
backport live changes
|
8 years ago |
|
ansuz
|
a04f179d8b
|
hide preview mode on phones
|
8 years ago |
|
ansuz
|
dc2b0ae6b4
|
jshint compliance
|
8 years ago |
|
ansuz
|
b32c329269
|
remember whether you were using preview mode for a pad
|
8 years ago |
|
ansuz
|
d9f7470f06
|
copy user details into sessionStorage for safari
|
8 years ago |
|
ansuz
|
a5ffd278a7
|
write styles for code in .less
|
8 years ago |
|
ansuz
|
3803f6a20f
|
only render preview if preview container is visible
|
8 years ago |
|
ansuz
|
617e027f12
|
catch markdown preview errors
|
8 years ago |
|
ansuz
|
c5bb830757
|
don't preview if hightlight mode is not markdown
|
8 years ago |
|
ansuz
|
fd83ae3e61
|
implement createRandomInteger
|
8 years ago |
|
ansuz
|
4d9060f49e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
378bf2aa94
|
yflory's word wrap fix
|
8 years ago |
|
ansuz
|
dc80b6b11f
|
throttle markdown preview
|
8 years ago |
|
yflory
|
f5f8e148ca
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
90f5713d4a
|
Fix an issue with the search bar redirecting to incorrect location
|
8 years ago |
|
ansuz
|
97cc4a6d54
|
add styling for tables in markdown preview
|
8 years ago |
|
ansuz
|
e6c04ccb49
|
bump server after paying for an account
|
8 years ago |
|
ansuz
|
6faca87e73
|
set preview content in read only mode
|
8 years ago |
|
ansuz
|
6324d9bbb0
|
feedback on template feature usage
|
8 years ago |
|
yflory
|
c3437382fb
|
Fix the release version in the what's new popup
|
8 years ago |
|
ansuz
|
4fae1b16c2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
70cae0d2c3
|
safely access pin reset response
|
8 years ago |
|
yflory
|
a50805545d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
d55b7e411c
|
Display an alert in the drive when the limit is reached
|
8 years ago |
|
ansuz
|
dac9d0647d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
259d34b7c8
|
jshint compliance
|
8 years ago |
|
yflory
|
40b99e7bbf
|
Get the file name before downloading the entire file
|
8 years ago |
|
ansuz
|
6dc3c62ba4
|
check for src before trying to ajax
|
8 years ago |
|
ansuz
|
a6cf761172
|
don't store media tag pages in the drive
|
8 years ago |
|
yflory
|
90a9764fa4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
346c289204
|
Fix lint errors
|
8 years ago |
|
ansuz
|
71dc0af6c7
|
better test for success error codes
|
8 years ago |
|
ansuz
|
0b6c587e2b
|
fetch and decrypt metadata with range requests
|
8 years ago |
|
yflory
|
eb31d0323c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a99080fb74
|
push the rest of the code
|
8 years ago |
|
yflory
|
408a4dad94
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
3964f4feee
|
Display the progress when downloading a file
|
8 years ago |
|
ansuz
|
dd73ad2dd5
|
add decryptMetadata function
|
8 years ago |
|
ansuz
|
5179252d3b
|
fix merge conflicts
|
8 years ago |
|
ansuz
|
4ee42b87d4
|
make file crypto great again
|
8 years ago |
|
yflory
|
c45f08f147
|
Use a download button instead of downloading a file automatically
|
8 years ago |
|
yflory
|
0c2f84058b
|
Improve css for the file app
|
8 years ago |
|
yflory
|
9c00a730f2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
538aec6ef5
|
Display a message when pinPads returns an error
|
8 years ago |
|
ansuz
|
03da870a7a
|
jshint compliance
|
8 years ago |
|
ansuz
|
af4fd3c6d3
|
resolve merge conflicts
|
8 years ago |
|
yflory
|
67a04a16ec
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
1ab6eb3c5d
|
Add a queue for multiple uploads in the file app
|
8 years ago |
|
ansuz
|
ba5ef5157e
|
show pretty representations of storage usage
|
8 years ago |
|
ansuz
|
0a54f0cf2d
|
better alignment of preview and code entry
|
8 years ago |
|
ansuz
|
e78299aed6
|
use async file decryption, listen for progress events.
|
8 years ago |
|
ansuz
|
bcd0303821
|
style /file/ with .less
|
8 years ago |
|
ansuz
|
ef155d8ccf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
310909dc9e
|
handle new error codes
|
8 years ago |
|
yflory
|
d014fccfce
|
Fix lint error
|
8 years ago |
|
yflory
|
2082b328b4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
814c81fb13
|
Display an alert when CryptPad has a new version
|
8 years ago |
|
ansuz
|
34606ea8ba
|
use newest xwiki media-tag
|
8 years ago |
|
ansuz
|
5a83259233
|
listen for decryption errors
|
8 years ago |
|
ansuz
|
2cee9534c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
d324a054f2
|
add progress bar to file upload
|
8 years ago |
|
yflory
|
21f9e31e75
|
Add a placeholder for the user app
|
8 years ago |
|
ansuz
|
164342920e
|
fix inverted condition
|
8 years ago |
|
yflory
|
620f4dc512
|
Add translations for the markdown preview button title
|
8 years ago |
|
yflory
|
51bd41d4e8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
0bd4caeb7e
|
Add the task list code to the markdown renderer
|
8 years ago |
|
ansuz
|
d187945e94
|
jshint compliance
|
8 years ago |
|
ansuz
|
3ba94a1ba2
|
correctly set release version number
|
8 years ago |
|
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
|
4debec39bb
|
update footer with next release codename and corrected matrix link
|
8 years ago |
|
ansuz
|
73ec91aa5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
80479fdc90
|
use rpc calls from cryptpad common
|
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 |
|
ansuz
|
8fe0282b7b
|
jshint compliance
|
8 years ago |
|
ansuz
|
827233dcba
|
new translation keys for file upload
|
8 years ago |
|
yflory
|
834830fc4f
|
Fix the Ctrl key + click to select multiple files
|
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 |
|
yflory
|
7ee6864ea4
|
Add the user menu in the login and register pages
|
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
|
cc893723de
|
add some TODOs, log uploaded content so we know it's working
|
8 years ago |
|
ansuz
|
2dd04f7631
|
get limits from the server
|
8 years ago |
|
yflory
|
716245f864
|
Make all the buttons look the same
|
8 years ago |
|
yflory
|
0f37d9def7
|
Change the button font size in the toolbar
|
8 years ago |