yflory
|
f9c26645cf
|
Upload images using the slide app
|
2017-06-13 16:15:04 +02:00 |
|
ansuz
|
17e4e9be27
|
download anything that isn't an image in media-tag
|
2017-06-13 16:12:13 +02:00 |
|
ansuz
|
1b574da053
|
fix typo
|
2017-06-13 12:24:32 +02:00 |
|
ansuz
|
7ad89bd9af
|
don't interrupt boot because of localStorage failure
|
2017-06-13 12:02:36 +02:00 |
|
ansuz
|
3337e2133a
|
more thorough tests for localStorage presence
|
2017-06-13 11:57:21 +02:00 |
|
yflory
|
4eeea93265
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-13 11:38:16 +02:00 |
|
yflory
|
11e2226f1a
|
Fix lint errors
|
2017-06-13 11:38:04 +02:00 |
|
ansuz
|
c779e328e8
|
warn users if their browser does not support localStorage
|
2017-06-13 11:33:25 +02:00 |
|
yflory
|
d7292e69c6
|
Fix undefined variable
|
2017-06-13 11:25:12 +02:00 |
|
yflory
|
803bad1421
|
Move the file upload code in a separate file
|
2017-06-13 11:21:26 +02:00 |
|
yflory
|
a58162a617
|
Make the drive tests work when not logged in
|
2017-06-12 17:49:33 +02:00 |
|
yflory
|
2fb5e3ae35
|
Merge branch 'staging' into newToolbar
|
2017-06-12 17:00:07 +02:00 |
|
yflory
|
969cec5d60
|
Make sure everything is synced before migrating the drive
|
2017-06-12 16:19:45 +02:00 |
|
yflory
|
7dd9ed543a
|
Merge branch 'newDrive' into staging
|
2017-06-12 16:08:09 +02:00 |
|
yflory
|
376b60c21c
|
New toolbar temp
|
2017-06-12 15:59:24 +02:00 |
|
ansuz
|
c9725af508
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 14:34:01 +02:00 |
|
ansuz
|
db9b9547d9
|
don't complain about missing callbacks for messages which are not our responsibility
|
2017-06-12 14:33:50 +02:00 |
|
yflory
|
30bdb9881c
|
Fix undefined element in select dropdown menus
|
2017-06-12 14:23:06 +02:00 |
|
yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
2017-06-12 12:47:25 +02:00 |
|
yflory
|
a5cb5f2ceb
|
Merge branch 'staging' into newDrive
|
2017-06-12 10:51:38 +02:00 |
|
yflory
|
9cc25d4c9f
|
Merge branch 'staging' into newDrive
|
2017-06-09 17:03:01 +02:00 |
|
yflory
|
a57f7c6ce7
|
Fix lint errors
|
2017-06-09 16:39:44 +02:00 |
|
ansuz
|
4bcad3e154
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-09 16:26:36 +02:00 |
|
ansuz
|
47857ec382
|
use cached pinned usage data
|
2017-06-09 16:17:20 +02:00 |
|
yflory
|
75c3c10b20
|
Merge branch 'soon' into staging
|
2017-06-09 15:56:45 +02:00 |
|
yflory
|
c1402fbb0a
|
Lint error
|
2017-06-09 15:56:18 +02:00 |
|
yflory
|
b36484931d
|
Lint
|
2017-06-09 15:55:46 +02:00 |
|
yflory
|
1fb638f519
|
clean the code
|
2017-06-09 15:50:13 +02:00 |
|
ansuz
|
23318357a6
|
make fewer RPC calls for usageBar
|
2017-06-09 15:33:03 +02:00 |
|
ansuz
|
df586a223c
|
update limits, usage, plan, and note whenever they are checked
|
2017-06-09 15:31:43 +02:00 |
|
ansuz
|
8bad0c556e
|
change log to error
|
2017-06-09 15:29:55 +02:00 |
|
ansuz
|
b0e00d337e
|
more careful validation
|
2017-06-09 15:28:53 +02:00 |
|
yflory
|
fd88162624
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:47:37 +02:00 |
|
yflory
|
7c9e86e351
|
Merge branch 'soon' into staging
|
2017-06-09 14:47:15 +02:00 |
|
yflory
|
9694272083
|
Fix html code not parsed
|
2017-06-09 14:42:55 +02:00 |
|
yflory
|
9ca10ba524
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:40:26 +02:00 |
|
yflory
|
7f120c8fc1
|
Merge branch 'soon' into staging
|
2017-06-09 14:38:36 +02:00 |
|
yflory
|
78e6118153
|
Merge branch 'staging' into newDrive
|
2017-06-09 14:38:21 +02:00 |
|
yflory
|
444c41974e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-09 14:37:54 +02:00 |
|
yflory
|
df5cbfb53e
|
Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon
|
2017-06-09 14:36:38 +02:00 |
|
yflory
|
6a96aa6819
|
Disconnect the network when migrating the drive in another tab
|
2017-06-09 14:36:35 +02:00 |
|
yflory
|
2a94bdaf05
|
test
|
2017-06-09 13:41:11 +02:00 |
|
yflory
|
ca95b5c42b
|
Remove unused console.log
|
2017-06-09 12:31:07 +02:00 |
|
yflory
|
f8c69573fd
|
Disconnect other tabs when migrating the drive
|
2017-06-09 12:23:28 +02:00 |
|
ansuz
|
c4e5741ae0
|
update upgrade button logic
|
2017-06-09 12:12:39 +02:00 |
|
ansuz
|
f1a9002417
|
use upgradeURL with usage bar
|
2017-06-09 10:46:11 +02:00 |
|
yflory
|
51e0d40572
|
Make sure the old storage key is removed after migration
|
2017-06-08 18:35:20 +02:00 |
|
yflory
|
b0fe04381d
|
Merge branch 'staging' into newDrive
|
2017-06-08 18:14:31 +02:00 |
|
yflory
|
1c2ea04f11
|
Drive refactoring
|
2017-06-08 17:52:00 +02:00 |
|
ansuz
|
fe42f5e88c
|
ask for new cookies and resend commands on NO_COOKIE errors
|
2017-06-08 14:19:14 +02:00 |
|
ansuz
|
da533b106a
|
improve type checking in getFileSize
|
2017-06-08 11:24:20 +02:00 |
|
ansuz
|
d25477e8c6
|
don't let tooltips interfere with DOM interaction
|
2017-06-06 18:08:23 +02:00 |
|
yflory
|
5641a4a839
|
Add the file app in the 'new' dropdown menus
|
2017-06-06 11:52:47 +02:00 |
|
yflory
|
ac91d2f413
|
Fix the upgrade and donate buttons in the home page
|
2017-06-06 11:37:54 +02:00 |
|
yflory
|
ee57458158
|
Remove the pin limit alert
|
2017-06-06 10:49:32 +02:00 |
|
ansuz
|
767793b5ca
|
fix stuck loading tip
|
2017-06-02 12:13:11 +02:00 |
|
ansuz
|
f631973f1f
|
optimize file upload
|
2017-06-01 18:16:02 +02:00 |
|
ansuz
|
55af84cc90
|
lower spinner timeout interval
|
2017-06-01 14:27:06 +02:00 |
|
ansuz
|
07279c8dc7
|
export boolean Test.testing
|
2017-06-01 10:23:24 +02:00 |
|
Caleb James DeLisle
|
71bd808e4f
|
Send everything through the test global function
|
2017-06-01 00:09:39 +02:00 |
|
Caleb James DeLisle
|
244bd7b378
|
;;;
|
2017-05-31 23:32:47 +02:00 |
|
Caleb James DeLisle
|
7d557df74b
|
a new and more horrible way of sniffing the logs out of the instance
|
2017-05-31 23:29:58 +02:00 |
|
Caleb James DeLisle
|
0d4b74cfba
|
;;;;;; keep these ;;; for later ;;;;;
|
2017-05-31 19:46:23 +02:00 |
|
Caleb James DeLisle
|
24f37ea414
|
Delicious testing
|
2017-05-31 19:40:17 +02:00 |
|
ansuz
|
7b94106bac
|
fix inverted conditional :/
|
2017-05-31 18:15:31 +02:00 |
|
ansuz
|
2e03485db4
|
remove known bad entries from localStorage.userHash...
|
2017-05-31 18:12:58 +02:00 |
|
ansuz
|
936bf8df9d
|
return falsey if userHash is junk
|
2017-05-31 18:08:41 +02:00 |
|
ansuz
|
105e5cdac9
|
fix 'undefined/' userHash
|
2017-05-31 18:01:12 +02:00 |
|
ansuz
|
401e908963
|
use media-tag with xhr error handling
|
2017-05-31 17:17:01 +02:00 |
|
ansuz
|
3465710237
|
Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag
|
2017-05-31 12:55:05 +02:00 |
|
Daniel RADEAU
|
21c39572be
|
Update media-tag and fix bower dependencies
|
2017-05-31 11:53:25 +02:00 |
|
ansuz
|
ebfa228bc0
|
add upgrade button to all static pages
|
2017-05-30 18:39:41 +02:00 |
|
ansuz
|
149568689a
|
color donate button green
|
2017-05-30 17:58:31 +02:00 |
|
ansuz
|
ec6ad6772b
|
send feedback on donation
|
2017-05-30 17:25:36 +02:00 |
|
Daniel RADEAU
|
cb2efe138b
|
Media Tag integration, image, audio, video, pdf
|
2017-05-30 16:36:06 +02:00 |
|
ansuz
|
9ca5bc507e
|
add support for donate button
|
2017-05-30 15:42:53 +02:00 |
|
Caleb James DeLisle
|
66520b6041
|
cleaned up the accounts, limits and revenue sharing and unified the config in one place
|
2017-05-26 18:09:31 +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 |
|
yflory
|
df2b00122a
|
New drive structure without file names
|
2017-05-24 18:59:44 +02:00 |
|
ansuz
|
d9f7470f06
|
copy user details into sessionStorage for safari
|
2017-05-24 18:28:16 +02:00 |
|
ansuz
|
fd83ae3e61
|
implement createRandomInteger
|
2017-05-24 11:34:40 +02:00 |
|
ansuz
|
dc80b6b11f
|
throttle markdown preview
|
2017-05-24 11:27:16 +02:00 |
|
ansuz
|
e6c04ccb49
|
bump server after paying for an account
|
2017-05-23 16:11:07 +02:00 |
|
ansuz
|
6324d9bbb0
|
feedback on template feature usage
|
2017-05-23 14:54:40 +02:00 |
|
yflory
|
c3437382fb
|
Fix the release version in the what's new popup
|
2017-05-23 11:22:32 +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 |
|
yflory
|
d55b7e411c
|
Display an alert in the drive when the limit is reached
|
2017-05-22 17:56:27 +02:00 |
|
ansuz
|
71dc0af6c7
|
better test for success error codes
|
2017-05-22 14:37:57 +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
|
ba5ef5157e
|
show pretty representations of storage usage
|
2017-05-19 18:37:31 +02:00 |
|
ansuz
|
e78299aed6
|
use async file decryption, listen for progress events.
|
2017-05-19 11:46:47 +02:00 |
|
ansuz
|
ef155d8ccf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-19 09:13:38 +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
|
2cee9534c5
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 17:58:33 +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 |
|
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
|
73ec91aa5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 12:46:36 +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 |
|
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 |
|
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
|
2dd04f7631
|
get limits from the server
|
2017-05-15 18:03:12 +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
|
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
|
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
|
42f3a62cac
|
handle errors with XHR
|
2017-05-12 16:13:09 +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
|
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
|
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 |
|
ansuz
|
6d30d7f89f
|
strip junk bytes from base64 more safely
|
2017-05-10 18:15:33 +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
|
5c8586f8a3
|
Fix typo in file upload
|
2017-05-10 15:00:05 +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 |