yflory
|
1077b3b267
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a98353af6c
|
Add a button to upload a file in the drive
|
8 years ago |
|
ansuz
|
295f9c00a6
|
send feedback on buttons
|
8 years ago |
|
yflory
|
497ddeee6d
|
Upload files with drag&drop in the drive
|
8 years ago |
|
ansuz
|
687b4d8307
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
69c3bd392f
|
update built media tag to latest XWiki version
|
8 years ago |
|
yflory
|
d8ebe566d8
|
Don't call mediatag for non-image files
|
8 years ago |
|
yflory
|
37d3d04f0e
|
Clean mediatag integration code
|
8 years ago |
|
ansuz
|
802146e2af
|
don't put download buttons in a div
|
8 years ago |
|
yflory
|
19cb920a7c
|
Don't redraw a media-tag everytime the content has changed
|
8 years ago |
|
yflory
|
2032c08066
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
f9c26645cf
|
Upload images using the slide app
|
8 years ago |
|
ansuz
|
17e4e9be27
|
download anything that isn't an image in media-tag
|
8 years ago |
|
ansuz
|
1b574da053
|
fix typo
|
8 years ago |
|
ansuz
|
7ad89bd9af
|
don't interrupt boot because of localStorage failure
|
8 years ago |
|
ansuz
|
3337e2133a
|
more thorough tests for localStorage presence
|
8 years ago |
|
yflory
|
4eeea93265
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
11e2226f1a
|
Fix lint errors
|
8 years ago |
|
ansuz
|
c779e328e8
|
warn users if their browser does not support localStorage
|
8 years ago |
|
yflory
|
d7292e69c6
|
Fix undefined variable
|
8 years ago |
|
yflory
|
803bad1421
|
Move the file upload code in a separate file
|
8 years ago |
|
yflory
|
a58162a617
|
Make the drive tests work when not logged in
|
8 years ago |
|
yflory
|
2fb5e3ae35
|
Merge branch 'staging' into newToolbar
|
8 years ago |
|
yflory
|
969cec5d60
|
Make sure everything is synced before migrating the drive
|
8 years ago |
|
yflory
|
7dd9ed543a
|
Merge branch 'newDrive' into staging
|
8 years ago |
|
yflory
|
376b60c21c
|
New toolbar temp
|
8 years ago |
|
ansuz
|
c9725af508
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
db9b9547d9
|
don't complain about missing callbacks for messages which are not our responsibility
|
8 years ago |
|
yflory
|
30bdb9881c
|
Fix undefined element in select dropdown menus
|
8 years ago |
|
yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
8 years ago |
|
yflory
|
a5cb5f2ceb
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
9cc25d4c9f
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
a57f7c6ce7
|
Fix lint errors
|
8 years ago |
|
ansuz
|
4bcad3e154
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
47857ec382
|
use cached pinned usage data
|
8 years ago |
|
yflory
|
75c3c10b20
|
Merge branch 'soon' into staging
|
8 years ago |
|
yflory
|
c1402fbb0a
|
Lint error
|
8 years ago |
|
yflory
|
b36484931d
|
Lint
|
8 years ago |
|
yflory
|
1fb638f519
|
clean the code
|
8 years ago |
|
ansuz
|
23318357a6
|
make fewer RPC calls for usageBar
|
8 years ago |
|
ansuz
|
df586a223c
|
update limits, usage, plan, and note whenever they are checked
|
8 years ago |
|
ansuz
|
8bad0c556e
|
change log to error
|
8 years ago |
|
ansuz
|
b0e00d337e
|
more careful validation
|
8 years ago |
|
yflory
|
fd88162624
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
7c9e86e351
|
Merge branch 'soon' into staging
|
8 years ago |
|
yflory
|
9694272083
|
Fix html code not parsed
|
8 years ago |
|
yflory
|
9ca10ba524
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
7f120c8fc1
|
Merge branch 'soon' into staging
|
8 years ago |
|
yflory
|
78e6118153
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
444c41974e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
df5cbfb53e
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
8 years ago |
|
yflory
|
6a96aa6819
|
Disconnect the network when migrating the drive in another tab
|
8 years ago |
|
yflory
|
2a94bdaf05
|
test
|
8 years ago |
|
yflory
|
ca95b5c42b
|
Remove unused console.log
|
8 years ago |
|
yflory
|
f8c69573fd
|
Disconnect other tabs when migrating the drive
|
8 years ago |
|
ansuz
|
c4e5741ae0
|
update upgrade button logic
|
8 years ago |
|
ansuz
|
f1a9002417
|
use upgradeURL with usage bar
|
8 years ago |
|
yflory
|
51e0d40572
|
Make sure the old storage key is removed after migration
|
8 years ago |
|
yflory
|
b0fe04381d
|
Merge branch 'staging' into newDrive
|
8 years ago |
|
yflory
|
1c2ea04f11
|
Drive refactoring
|
8 years ago |
|
ansuz
|
fe42f5e88c
|
ask for new cookies and resend commands on NO_COOKIE errors
|
8 years ago |
|
ansuz
|
da533b106a
|
improve type checking in getFileSize
|
8 years ago |
|
ansuz
|
d25477e8c6
|
don't let tooltips interfere with DOM interaction
|
8 years ago |
|
yflory
|
5641a4a839
|
Add the file app in the 'new' dropdown menus
|
8 years ago |
|
yflory
|
ac91d2f413
|
Fix the upgrade and donate buttons in the home page
|
8 years ago |
|
yflory
|
ee57458158
|
Remove the pin limit alert
|
8 years ago |
|
ansuz
|
767793b5ca
|
fix stuck loading tip
|
8 years ago |
|
ansuz
|
f631973f1f
|
optimize file upload
|
8 years ago |
|
ansuz
|
55af84cc90
|
lower spinner timeout interval
|
8 years ago |
|
ansuz
|
07279c8dc7
|
export boolean Test.testing
|
8 years ago |
|
Caleb James DeLisle
|
71bd808e4f
|
Send everything through the test global function
|
8 years ago |
|
Caleb James DeLisle
|
244bd7b378
|
;;;
|
8 years ago |
|
Caleb James DeLisle
|
7d557df74b
|
a new and more horrible way of sniffing the logs out of the instance
|
8 years ago |
|
Caleb James DeLisle
|
0d4b74cfba
|
;;;;;; keep these ;;; for later ;;;;;
|
8 years ago |
|
Caleb James DeLisle
|
24f37ea414
|
Delicious testing
|
8 years ago |
|
ansuz
|
7b94106bac
|
fix inverted conditional :/
|
8 years ago |
|
ansuz
|
2e03485db4
|
remove known bad entries from localStorage.userHash...
|
8 years ago |
|
ansuz
|
936bf8df9d
|
return falsey if userHash is junk
|
8 years ago |
|
ansuz
|
105e5cdac9
|
fix 'undefined/' userHash
|
8 years ago |
|
ansuz
|
401e908963
|
use media-tag with xhr error handling
|
8 years ago |
|
ansuz
|
3465710237
|
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
|
8 years ago |
|
Daniel RADEAU
|
21c39572be
|
Update media-tag and fix bower dependencies
|
8 years ago |
|
ansuz
|
ebfa228bc0
|
add upgrade button to all static pages
|
8 years ago |
|
ansuz
|
149568689a
|
color donate button green
|
8 years ago |
|
ansuz
|
ec6ad6772b
|
send feedback on donation
|
8 years ago |
|
Daniel RADEAU
|
cb2efe138b
|
Media Tag integration, image, audio, video, pdf
|
8 years ago |
|
ansuz
|
9ca5bc507e
|
add support for donate button
|
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 |
|
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 |
|
yflory
|
df2b00122a
|
New drive structure without file names
|
8 years ago |
|
ansuz
|
d9f7470f06
|
copy user details into sessionStorage for safari
|
8 years ago |
|
ansuz
|
fd83ae3e61
|
implement createRandomInteger
|
8 years ago |
|
ansuz
|
dc80b6b11f
|
throttle markdown preview
|
8 years ago |
|
ansuz
|
e6c04ccb49
|
bump server after paying for an account
|
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
|
d55b7e411c
|
Display an alert in the drive when the limit is reached
|
8 years ago |
|
ansuz
|
71dc0af6c7
|
better test for success error codes
|
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
|
ba5ef5157e
|
show pretty representations of storage usage
|
8 years ago |
|
ansuz
|
e78299aed6
|
use async file decryption, listen for progress events.
|
8 years ago |
|
ansuz
|
ef155d8ccf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
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
|
2cee9534c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
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 |
|
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 |