yflory
|
8471dab6b1
|
Provide hints in theme and language dropdowns
|
2017-06-12 12:47:25 +02:00 |
|
Pierre Bondoerffer
|
5d565660a9
|
tiny fixes
|
2017-06-12 12:41:03 +02:00 |
|
Pierre Bondoerffer
|
6bc191725f
|
poll: support disconnect and fix trash button
|
2017-06-12 12:37:07 +02:00 |
|
ansuz
|
b3221c0fb4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 12:32:48 +02:00 |
|
ansuz
|
0c957989d2
|
add link to upload table when complete
|
2017-06-12 12:31:52 +02:00 |
|
yflory
|
5d6a0dcc1b
|
Fix width transition when dragging preview
|
2017-06-12 12:27:24 +02:00 |
|
Pierre Bondoerffer
|
6dd80c26b1
|
Make editing more visible
|
2017-06-12 12:00:39 +02:00 |
|
yflory
|
3ff3eac283
|
Fix a race condition causing the drive to be empty
|
2017-06-12 11:54:20 +02:00 |
|
yflory
|
a5cb5f2ceb
|
Merge branch 'staging' into newDrive
|
2017-06-12 10:51:38 +02:00 |
|
yflory
|
1b671edce9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-06-12 10:50:30 +02:00 |
|
yflory
|
9a4a6e9b40
|
Always display the upgrade button in the drive
|
2017-06-12 10:17:52 +02:00 |
|
yflory
|
9cc25d4c9f
|
Merge branch 'staging' into newDrive
|
2017-06-09 17:03:01 +02:00 |
|
yflory
|
7134b00544
|
Add a button to display the context menu for the trash on mobiles
|
2017-06-09 17:02:50 +02:00 |
|
yflory
|
d24458e4b0
|
Fix the tests to work with the async migration
|
2017-06-09 16:41:51 +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 |
|
yflory
|
9d758a040b
|
Fix an issue with the search field not displayed properly
|
2017-06-09 15:45:46 +02:00 |
|
ansuz
|
08902c0910
|
drop extraneous argument
|
2017-06-09 15:33:28 +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 |
|
ansuz
|
fe2fef5e4c
|
support dragging and dropping multiple files
|
2017-06-08 18:12:17 +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
|
e723228060
|
always show upgrade button in drive
|
2017-06-08 14:03:01 +02:00 |
|
ansuz
|
da533b106a
|
improve type checking in getFileSize
|
2017-06-08 11:24:20 +02:00 |
|
ansuz
|
2f851ab97e
|
fix lint errors
|
2017-06-07 10:13:51 +02:00 |
|
ansuz
|
d25477e8c6
|
don't let tooltips interfere with DOM interaction
|
2017-06-06 18:08:23 +02:00 |
|
yflory
|
811d031ffd
|
Fix the 'File' entry in the drive 'New' menu
|
2017-06-06 12:09:55 +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
|
f43132a63b
|
bump version in footer and package.json
|
2017-06-06 10:01:07 +02:00 |
|
ansuz
|
ec9a4dec5e
|
Merge branch 'soon' into staging
|
2017-06-05 11:43:26 +02:00 |
|
ansuz
|
77d4ffba86
|
animate preview mode sidebar
|
2017-06-02 17:39:45 +02:00 |
|
ansuz
|
65233c2464
|
remove unused variable
|
2017-06-02 16:16:17 +02:00 |
|
ansuz
|
767793b5ca
|
fix stuck loading tip
|
2017-06-02 12:13:11 +02:00 |
|
ansuz
|
8f7aaecc1c
|
cache some selectors and decrease memory demands
|
2017-06-02 11:45:54 +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
|
c65ca5cfc6
|
restore deleted line and add missing semicolon
|
2017-06-01 10:35:42 +02:00 |
|
ansuz
|
8bd9ad8847
|
add automated registration test
|
2017-06-01 10:23:50 +02:00 |
|
ansuz
|
07279c8dc7
|
export boolean Test.testing
|
2017-06-01 10:23:24 +02:00 |
|
Caleb James DeLisle
|
c8bd1bb2ac
|
Trying to improve the tests which fail always when running remotely
|
2017-06-01 00:29:17 +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
|
5e57578fa9
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-05-31 18:44:55 +02:00 |
|
ansuz
|
30f66ab7ba
|
hotfix 'undefined/' bug
|
2017-05-31 18:44:44 +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
|
8ab9248a78
|
Fix ES6
|
2017-05-31 12:42:37 +02:00 |
|
Daniel RADEAU
|
21c39572be
|
Update media-tag and fix bower dependencies
|
2017-05-31 11:53:25 +02:00 |
|
ansuz
|
daf112a5b5
|
take api settings into account for upgrade button
|
2017-05-30 20:11:15 +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
|
76c530037b
|
enable donate button in all apps
|
2017-05-30 15:51:07 +02:00 |
|
ansuz
|
9ca5bc507e
|
add support for donate button
|
2017-05-30 15:42:53 +02:00 |
|
ansuz
|
a70014dd11
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-30 10:46:17 +02:00 |
|
ansuz
|
99a44f119f
|
don't send referrer headers on pads which may link outward
|
2017-05-30 10:44:40 +02:00 |
|
ansuz
|
92a7970eb8
|
fix merge conflicts
|
2017-05-29 19:04:47 +02:00 |
|
ansuz
|
1240b864ef
|
fix misconfigured history
|
2017-05-29 17:25:06 +02:00 |
|
Pierre Bondoerffer
|
f434f002c4
|
poll: make locks clickable
|
2017-05-29 16:32:40 +02:00 |
|
ansuz
|
3915b30055
|
provide a register button on login
also direct users from file to login
|
2017-05-29 13:11:07 +02:00 |
|
Pierre Bondoerffer
|
b6bb576a34
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into newpoll
|
2017-05-29 12:59:49 +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 |
|
Pierre Bondoerffer
|
1092285a68
|
merge master
|
2017-05-26 16:18:51 +02:00 |
|
Caleb James DeLisle
|
6c1861dbc6
|
Merge branch 'soon' into staging
|
2017-05-26 15:48:44 +02:00 |
|
Caleb James DeLisle
|
2ecf257fcd
|
Sync localStorage with sessionStorage in auth because safari...
|
2017-05-26 15:30:01 +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 |
|
yflory
|
df2b00122a
|
New drive structure without file names
|
2017-05-24 18:59:44 +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
|
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 |
|
yflory
|
f5f8e148ca
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-23 18:09:42 +02:00 |
|
yflory
|
90f5713d4a
|
Fix an issue with the search bar redirecting to incorrect location
|
2017-05-23 18:09:30 +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 |
|
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
|
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 |
|
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 17:57:05 +02:00 |
|
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
2017-05-05 17:56:49 +02:00 |
|
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
2017-05-05 15:47:46 +02:00 |
|
ansuz
|
6471b572eb
|
correct off-by-one
|
2017-05-05 15:40:31 +02:00 |
|
ansuz
|
3a338e0890
|
fix undefined reference
|
2017-05-05 15:20:41 +02:00 |
|
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
2017-05-05 15:09:07 +02:00 |
|
yflory
|
5a5b02b82b
|
Don't store in the drive pads without a hash
|
2017-05-05 11:55:19 +02:00 |
|
ansuz
|
c07d3e6162
|
update version strings for upcoming release
|
2017-05-05 11:51:41 +02:00 |
|
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
2017-05-05 09:10:31 +02:00 |
|
ansuz
|
6a00d11a15
|
fix undefined reference
|
2017-05-04 18:28:52 +02:00 |
|
ansuz
|
c3d1554e8c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 18:25:23 +02:00 |
|
ansuz
|
660cda6573
|
set title when uploading
|
2017-05-04 18:25:06 +02:00 |
|
yflory
|
706120ae5b
|
Display images uploaded in the File app with the Media app
|
2017-05-04 18:24:58 +02:00 |
|
yflory
|
28cb40d7ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 17:14:30 +02:00 |
|
yflory
|
1b6fae4dd2
|
Update mediatag
|
2017-05-04 17:14:24 +02:00 |
|
ansuz
|
a0c420af8e
|
jshint compliance
|
2017-05-04 16:37:25 +02:00 |
|
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:16:16 +02:00 |
|
ansuz
|
78b11584f8
|
remove unused variables
|
2017-05-04 16:16:09 +02:00 |
|
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:08:21 +02:00 |
|
yflory
|
a190c99426
|
Toolbar refactoring
|
2017-05-04 16:08:12 +02:00 |
|
ansuz
|
5739c3d973
|
blow up if you ever run out of nonce-space
|
2017-05-04 12:20:38 +02:00 |
|
ansuz
|
2232518c64
|
set title after uploading
|
2017-05-04 12:01:37 +02:00 |
|
ansuz
|
f644dc6c0b
|
WIP support encrypted file upload via base64 chunks
|
2017-05-04 11:37:46 +02:00 |
|
ansuz
|
7573b86946
|
call back with error if an RPC is made while disconnected
|
2017-05-04 11:36:24 +02:00 |
|
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
2017-05-04 11:20:52 +02:00 |
|
yflory
|
cd98fc6eab
|
Increase the z-index of the select area in the drive
|
2017-05-03 17:18:10 +02:00 |
|
yflory
|
80115d0071
|
Fix an 'undefined' variable error in the drive
|
2017-05-03 17:17:42 +02:00 |
|
yflory
|
c9d89debba
|
Fix lint errors
|
2017-05-03 16:17:52 +02:00 |
|
yflory
|
79365a7a82
|
Use the shift key to select multiple files in CryptDrive
|
2017-05-03 16:15:37 +02:00 |
|
yflory
|
3262787244
|
Update the icon mode in CryptDrive
|
2017-05-03 14:02:45 +02:00 |
|
yflory
|
d52e9fba43
|
Use the arrow keys to change the selection in the drive
|
2017-05-03 13:20:28 +02:00 |
|
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
2017-05-02 17:14:53 +02:00 |
|
yflory
|
1d3b8188b3
|
Add mobile support in the slide app
|
2017-05-02 14:17:17 +02:00 |
|
yflory
|
d2e46d1378
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-02 11:04:14 +02:00 |
|
yflory
|
092b98d235
|
Fix the offset of the drag&select feature in the drive
|
2017-05-02 10:41:31 +02:00 |
|
ansuz
|
f2672d587a
|
fix variable redefinition
|
2017-05-02 09:42:51 +02:00 |
|
ansuz
|
0e7eeb285c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-29 14:24:14 +02:00 |
|
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
2017-04-28 18:23:41 +02:00 |
|
ansuz
|
cf4dee28f7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 17:13:18 +02:00 |
|
ansuz
|
28e4ef1b13
|
WIP RPC code
|
2017-04-28 17:11:50 +02:00 |
|
yflory
|
afb0061d7b
|
Fix an issue with anonymous user unable to store new pads
|
2017-04-28 17:11:07 +02:00 |
|
yflory
|
56aaeea003
|
Fix the drive toolbar not displaying the displayName
|
2017-04-28 17:03:47 +02:00 |
|
yflory
|
538e85c080
|
Fix the context menu in the drive flowing off the screen if too long
|
2017-04-28 16:23:01 +02:00 |
|
ansuz
|
841c9ee9de
|
don't close popup dialog when hitting enter if textarea has focus
|
2017-04-28 16:11:22 +02:00 |
|
ansuz
|
3fa0a73025
|
prevent using string methods on undefined variable
|
2017-04-28 16:09:46 +02:00 |
|
ansuz
|
1b3ce5aa96
|
fix typo
|
2017-04-28 16:08:47 +02:00 |
|
yflory
|
a51a35da70
|
Fix an issue with hashes ending with a slash
|
2017-04-28 15:47:31 +02:00 |
|
yflory
|
d9b5eb8a97
|
Fix an issue with the right click triggering the select area
|
2017-04-28 15:43:05 +02:00 |
|
yflory
|
ef58120819
|
Prevent multiple concurrent clicks to get the history
|
2017-04-28 14:09:59 +02:00 |
|
ansuz
|
38a115d8f8
|
feedback on anonymous drive
|
2017-04-28 14:08:17 +02:00 |
|
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
2017-04-28 13:06:55 +02:00 |
|
yflory
|
0ee228666b
|
Replace the IRC link by the Matrix one
|
2017-04-28 12:40:39 +02:00 |
|
yflory
|
c820b3485c
|
Fix function undefined when loading a template
|
2017-04-28 12:16:45 +02:00 |
|
yflory
|
0ef1c14d7f
|
Fix lint errors
|
2017-04-28 12:12:17 +02:00 |
|
yflory
|
fc760b4820
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 12:08:21 +02:00 |
|
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
2017-04-28 12:08:05 +02:00 |
|
ansuz
|
e51c7f9cf0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 11:46:24 +02:00 |
|
ansuz
|
e132ccf94a
|
prepare for upload
|
2017-04-28 11:45:53 +02:00 |
|
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
2017-04-27 18:46:46 +02:00 |
|
yflory
|
197b366712
|
Ability to drag&select in the drive
|
2017-04-27 17:01:56 +02:00 |
|
ansuz
|
e2942f959b
|
add crypto for decrypting a chunked file
|
2017-04-27 12:56:42 +02:00 |
|
ansuz
|
aedc46bdaf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-27 12:47:27 +02:00 |
|
ansuz
|
a97e7223f1
|
implement getBlobPathFromHex
|
2017-04-27 12:47:21 +02:00 |
|
yflory
|
520dabe094
|
Remove the unsorted files category
|
2017-04-26 18:46:40 +02:00 |
|
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
2017-04-26 14:55:06 +02:00 |
|
yflory
|
6a8274518b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:42:33 +02:00 |
|
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
2017-04-25 18:42:21 +02:00 |
|
ansuz
|
12898b3358
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:28:48 +02:00 |
|
ansuz
|
74bcec8b31
|
programming is hard okay
|
2017-04-25 18:28:39 +02:00 |
|
yflory
|
2a417ddae8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 17:22:07 +02:00 |
|
yflory
|
d985b144cc
|
Add a new hash version for the file viewer
|
2017-04-25 17:19:13 +02:00 |
|
ansuz
|
3309087277
|
send feedback if isArray is not supported
|
2017-04-25 17:09:39 +02:00 |
|
ansuz
|
f196b836db
|
fix undefined reference
|
2017-04-25 16:17:52 +02:00 |
|
ansuz
|
48973bccd6
|
add tests to assert for hash parsing
|
2017-04-25 16:11:19 +02:00 |
|
ansuz
|
5194677443
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 14:57:34 +02:00 |
|
yflory
|
c9c7d61ad1
|
Media tag viewer
|
2017-04-25 14:55:38 +02:00 |
|
ansuz
|
729d1460b9
|
Merge branch 'master' into staging
|
2017-04-25 14:35:24 +02:00 |
|
ansuz
|
a840fb9e85
|
add example hashes and start working on hash v2
|
2017-04-25 14:33:57 +02:00 |
|
ansuz
|
d1fa68e30d
|
build UCF Media Tag
|
2017-04-24 17:13:32 +02:00 |
|
ansuz
|
cc33c4abe9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-24 15:41:46 +02:00 |
|
ansuz
|
a5ca461a73
|
update footer for new version
|
2017-04-24 15:41:29 +02:00 |
|
yflory
|
fdd51ec18d
|
Don't remove a folder moved into unsorted or into itself
|
2017-04-24 15:38:03 +02:00 |
|
ansuz
|
4b95a1da48
|
unbreak assert/translations
|
2017-04-24 14:32:56 +02:00 |
|
ansuz
|
4fdc5f897e
|
only feedback migration if user had legacy store
|
2017-04-24 14:26:55 +02:00 |
|
ansuz
|
218f2ff76c
|
feedback when logging in or registering
|
2017-04-24 14:15:17 +02:00 |
|
yflory
|
4c3e842664
|
Fix focus issues with the history input in ckeditor
|
2017-04-24 13:55:03 +02:00 |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
2017-04-24 13:43:18 +02:00 |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
2017-04-24 11:41:00 +02:00 |
|
ansuz
|
18e2e66b06
|
jshint compliance
|
2017-04-24 11:39:39 +02:00 |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
2017-04-21 17:31:47 +02:00 |
|
ansuz
|
4c0d7bf8e8
|
support multiple calls to cryptpad.ready
|
2017-04-21 16:51:32 +02:00 |
|
ansuz
|
ec041c88e2
|
console.log when providing feedback
also notify server if a users browser does not support proxies
|
2017-04-21 15:53:13 +02:00 |
|
ansuz
|
c51073f211
|
support batch getFileSize calls
|
2017-04-21 14:51:20 +02:00 |
|
ansuz
|
1af621bfe5
|
Merge remote-tracking branch 'origin/auth' into staging
|
2017-04-20 17:27:32 +02:00 |
|
ansuz
|
3afaf029cb
|
feedback about how often we migrate an old drive
|
2017-04-20 17:06:09 +02:00 |
|
Caleb James DeLisle
|
0e8b55edc0
|
Added an authentication page to allow getting the user pubkey
|
2017-04-20 10:15:07 +02:00 |
|
ansuz
|
df9c312b7d
|
make new text translateable
|
2017-04-18 18:31:58 +02:00 |
|
ansuz
|
e8b053e48b
|
use bootloader in feedback.html
|
2017-04-18 17:31:35 +02:00 |
|
ansuz
|
a6dbfcecf3
|
remove old/unused assertions
|
2017-04-18 17:28:09 +02:00 |
|
ansuz
|
b658bda421
|
use bootloader to fix paths to jquery and json.sortify
|
2017-04-18 17:24:46 +02:00 |
|
ansuz
|
347459781c
|
show the size of your files, if you're logged in
|
2017-04-18 15:49:04 +02:00 |
|
ansuz
|
2b8579e8b7
|
add pretty-printers for byte-counts
|
2017-04-18 15:44:15 +02:00 |
|
ansuz
|
2a25afae5f
|
Merge branch 'soon' into staging
|
2017-04-18 12:24:45 +02:00 |
|
ansuz
|
e0ecf651e2
|
add a note about showing pinned file usage
|
2017-04-18 12:23:58 +02:00 |
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
2017-04-18 12:14:32 +02:00 |
|
ansuz
|
da69c1822c
|
ask users to sign back if signing keys are missing
|
2017-04-18 11:58:41 +02:00 |
|
Pierre Bondoerffer
|
7a05462eb3
|
Some more poll changes <3
|
2017-04-14 19:34:58 +02:00 |
|
ansuz
|
107e75b287
|
remove invalid semicolon
|
2017-04-14 19:24:20 +02:00 |
|
ansuz
|
821c1a3ec6
|
annotate code which we hope to be able to deprecate in the future
|
2017-04-14 18:44:08 +02:00 |
|
yflory
|
43c045721c
|
Get the channel history
|
2017-04-14 18:36:36 +02:00 |
|
ansuz
|
f6d6f81d55
|
send feedback when a user registers
|
2017-04-14 18:21:11 +02:00 |
|
ansuz
|
deeb47c40b
|
reportAppUsage for settings
|
2017-04-14 18:19:04 +02:00 |
|
Pierre Bondoerffer
|
05785e96ea
|
small color change
|
2017-04-14 17:47:05 +02:00 |
|
ansuz
|
5a83759ee2
|
add usage button to settings page
|
2017-04-14 17:18:17 +02:00 |
|
ansuz
|
a27cc76fc0
|
uppercase LOL
|
2017-04-14 15:35:02 +02:00 |
|
ansuz
|
402ce2db93
|
better validation of inputs
|
2017-04-14 15:34:22 +02:00 |
|
ansuz
|
c7eae9675b
|
keep exporting isArray for backwards compatibility
but prevent internal use
|
2017-04-14 15:34:05 +02:00 |
|
ansuz
|
fbebbf0dca
|
minor clean up
|
2017-04-14 15:32:12 +02:00 |
|
ansuz
|
525d35c9ec
|
redefine alert
|
2017-04-14 14:54:43 +02:00 |
|
Pierre Bondoerffer
|
20c252e5c6
|
fix placeholder styling in safari
|
2017-04-14 12:45:45 +02:00 |
|
ansuz
|
f694a81a5c
|
move more interface code out of cryptpad-common
|
2017-04-14 12:25:32 +02:00 |
|
ansuz
|
a4157b9908
|
remove more unused functions
|
2017-04-14 12:14:10 +02:00 |
|
ansuz
|
e10901edb2
|
begin to move interface code out of cryptpad-common
|
2017-04-14 12:09:00 +02:00 |
|
ansuz
|
95789d3cbe
|
expose rpc for pinned usage
|
2017-04-14 11:41:51 +02:00 |
|
ansuz
|
8f4dbcf4c6
|
remove getPadTitle
|
2017-04-14 11:41:18 +02:00 |
|
ansuz
|
f42da4ecd8
|
move hashChannelList into common-hash.js
|
2017-04-14 11:40:28 +02:00 |
|
ansuz
|
63960bd38c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 19:47:04 +02:00 |
|
ansuz
|
520ae822fc
|
correct undefined reference
|
2017-04-13 19:46:52 +02:00 |
|
ansuz
|
50277cb0ae
|
don't rely on 'info' in onRemote so we can call it anywhere
|
2017-04-13 19:46:38 +02:00 |
|
ansuz
|
bf047fcf65
|
Merge pull request #110 from pbondoer/newpoll
Fix flash of autocomplete in poll
|
2017-04-13 19:43:30 +02:00 |
|
Pierre Bondoerffer
|
96ff487271
|
fix flash of content
|
2017-04-13 19:36:04 +02:00 |
|
ansuz
|
5a7eea08c8
|
Merge pull request #108 from pbondoer/newpoll
Poll fixes
|
2017-04-13 18:04:13 +02:00 |
|
Pierre Bondoerffer
|
248f88034b
|
important fixes
|
2017-04-13 17:56:28 +02:00 |
|
yflory
|
633d60ccd0
|
Remove a TODO
|
2017-04-13 17:19:32 +02:00 |
|
Pierre Bondoerffer
|
6b57bb2bbb
|
poll: press enter to validate input
|
2017-04-13 17:09:31 +02:00 |
|
Pierre Bondoerffer
|
d483e10e77
|
poll fixes
|
2017-04-13 17:07:09 +02:00 |
|
yflory
|
81d83897ec
|
Rename hash.js
|
2017-04-13 17:04:15 +02:00 |
|
yflory
|
2ad0a65b71
|
Remove shortcuts that override browser actions
|
2017-04-13 16:43:07 +02:00 |
|
Pierre Bondoerffer
|
ea5301be13
|
poll improved(tm)
|
2017-04-13 16:31:57 +02:00 |
|
Pierre Bondoerffer
|
7434dbcb0f
|
what i have
|
2017-04-13 15:27:37 +02:00 |
|
yflory
|
07705cd5c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-13 15:04:23 +02:00 |
|
yflory
|
eb2a3c1bbf
|
Fix lint errors
|
2017-04-13 15:04:17 +02:00 |
|
ansuz
|
607d9652f5
|
jshint compliance
|
2017-04-13 14:48:15 +02:00 |
|
yflory
|
3ba90332bb
|
Merge branch 'refactor' into staging
|
2017-04-13 14:44:55 +02:00 |
|
Pierre Bondoerffer
|
f11cf8e6ac
|
move poll styles to separate file
|
2017-04-13 14:14:12 +02:00 |
|
yflory
|
daabb0b3ad
|
Integrate and fix the new fileObject (userObject)
|
2017-04-13 14:06:40 +02:00 |
|
ansuz
|
df4a250359
|
use feedback api instead of app=
|
2017-04-13 12:18:08 +02:00 |
|
ansuz
|
86c37bfa37
|
fix find+replace error
|
2017-04-13 11:11:45 +02:00 |
|
ansuz
|
e618483395
|
extract all code for encoding and decoding hashes
|
2017-04-13 11:05:28 +02:00 |
|
ansuz
|
fdd2716ad5
|
move constants to the top of cryptpad-common.js
|
2017-04-13 10:31:08 +02:00 |
|
yflory
|
c1e0316d43
|
Refactor fileObject
|
2017-04-12 18:54:22 +02:00 |
|
ansuz
|
5212539a16
|
move standalone functions from common into their own file
|
2017-04-12 17:54:44 +02:00 |
|
ansuz
|
7437d6b902
|
remove unused function
|
2017-04-12 17:09:42 +02:00 |
|
ansuz
|
4e590a9dd1
|
remove even more dead code
|
2017-04-12 16:16:58 +02:00 |
|
ansuz
|
85fcaa9bbc
|
remove more dead code
|
2017-04-12 16:13:25 +02:00 |
|
ansuz
|
401936a91e
|
move singly-used css file out of /common/
|
2017-04-12 16:09:05 +02:00 |
|
ansuz
|
9a46b58c85
|
deprecate this 90 days after f-release
|
2017-04-12 16:03:41 +02:00 |
|
ansuz
|
7a59183bb1
|
pinpad.create should always be async
|
2017-04-12 16:02:42 +02:00 |
|
ansuz
|
8de3610532
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-12 16:02:09 +02:00 |
|
ansuz
|
9aa0548b1f
|
remove dead cursor code
|
2017-04-12 15:59:30 +02:00 |
|
yflory
|
4e61b79f9a
|
Clean fileObject
|
2017-04-11 15:11:33 +02:00 |
|
yflory
|
cde724399c
|
Pin the pads
|
2017-04-11 14:53:44 +02:00 |
|
yflory
|
74ea2fce5a
|
Fix lint error...
|
2017-04-10 19:18:46 +02:00 |
|
yflory
|
aa49c97d6e
|
Fix lint error
|
2017-04-10 19:13:36 +02:00 |
|
ansuz
|
2c8d1b8183
|
jshint compliance
|
2017-04-10 19:12:22 +02:00 |
|
yflory
|
f0836f745e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-10 18:25:17 +02:00 |
|
yflory
|
528deb11da
|
Add missing file for whiteboard
|
2017-04-10 18:25:02 +02:00 |
|
ansuz
|
cde9ea9887
|
update footer version
|
2017-04-10 18:09:22 +02:00 |
|
ansuz
|
05a50b1f4c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-10 17:42:43 +02:00 |
|
ansuz
|
a14bb1480a
|
progress for implicit pinning
|
2017-04-10 17:42:35 +02:00 |
|
ansuz
|
f82278a25c
|
handle return of undefined hash
|
2017-04-10 17:38:25 +02:00 |
|
yflory
|
d5e69653c0
|
Select opacity in draw mode in the canvas app
|
2017-04-10 17:03:50 +02:00 |
|
ansuz
|
1d933be5a6
|
make reset return the hash, not an array with containing it
|
2017-04-10 15:57:38 +02:00 |
|
yflory
|
f34492be94
|
Remove duplicates uid in the user list
|
2017-04-10 15:27:01 +02:00 |
|
yflory
|
cfc5d634f4
|
Merge branch 'templates' into staging
|
2017-04-10 14:19:48 +02:00 |
|
yflory
|
bd16e0f0e7
|
Templates in polls and canvas, and ability to disable templates
|
2017-04-10 14:19:15 +02:00 |
|
yflory
|
63a130c678
|
Add a button to delete the selection in canvas
|
2017-04-10 11:55:39 +02:00 |
|
yflory
|
33e19d5918
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-10 11:44:17 +02:00 |
|
yflory
|
126498585e
|
Add a context menu on the ROOT folder in the drive
|
2017-04-10 11:44:11 +02:00 |
|
yflory
|
be1db2a1ec
|
Ability to remove an object when draw mode is off
|
2017-04-10 11:28:41 +02:00 |
|
ansuz
|
108ab7e9de
|
comment out a style assignment that doesn't seem necessary
|
2017-04-09 11:55:27 +02:00 |
|
ansuz
|
8c629185e1
|
cleaner less file
|
2017-04-09 11:49:14 +02:00 |
|
ansuz
|
0db141e48d
|
rename style files 'whiteboard' instead of main
|
2017-04-09 11:48:01 +02:00 |
|
ansuz
|
395d8625a8
|
draw the palette on pad creation
|
2017-04-08 10:44:12 +02:00 |
|
ansuz
|
3b99c42e22
|
no more inline styles
|
2017-04-07 22:05:31 +02:00 |
|
ansuz
|
ef821c3e7e
|
integrate @lukevers improvements and clean up js a bit
|
2017-04-07 19:39:08 +02:00 |
|
yflory
|
84d8615cf1
|
Save and use templates in pad, code and slides
|
2017-04-07 18:20:03 +02:00 |
|
ansuz
|
bd2034c47b
|
prepare rpc before 'ready' if pinning is enabled
|
2017-04-07 17:24:25 +02:00 |
|
ansuz
|
a70388284d
|
disable unnecessary messages
|
2017-04-07 17:21:04 +02:00 |
|
ansuz
|
abd87e1322
|
jshint compliance
|
2017-04-07 16:33:14 +02:00 |
|
ansuz
|
e4b15bc616
|
implement 'getCanonicalChannelList'
|
2017-04-07 15:52:34 +02:00 |
|
ansuz
|
09f8e139fe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-07 15:20:39 +02:00 |
|
ansuz
|
a2f692b9a3
|
clean up serverside and clientside pinning logic
|
2017-04-07 15:20:30 +02:00 |
|
yflory
|
a13261abaa
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-07 14:54:13 +02:00 |
|
yflory
|
dedf2b3c69
|
Display selected color and button to turn off draw mode in canvas
|
2017-04-07 14:54:02 +02:00 |
|
ansuz
|
fdede0d1fd
|
remove some dead code
|
2017-04-07 12:18:03 +02:00 |
|
ansuz
|
e87992c7ec
|
implement atomic pin reset rpc
|
2017-04-07 11:37:19 +02:00 |
|
ansuz
|
166e70f628
|
test new rpc apis
|
2017-04-07 10:32:26 +02:00 |
|
ansuz
|
2a566671f2
|
remove outdated rpc example
|
2017-04-07 10:31:38 +02:00 |
|
ansuz
|
3380cf0348
|
implement getTotalSize rpc
|
2017-04-07 10:09:59 +02:00 |
|
ansuz
|
6e1ffcc18d
|
define better color palette
|
2017-04-06 18:45:40 +02:00 |
|
yflory
|
84029ac2d7
|
Fix the color picker in Chromium 53 and improve the cursor
|
2017-04-06 12:38:11 +02:00 |
|
ansuz
|
5c292fb1fa
|
jshint compliance
|
2017-04-06 08:32:31 +02:00 |
|
yflory
|
b14d89360d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 19:00:13 +02:00 |
|
yflory
|
8e29e30a35
|
Realtime palette + cursor corresponding to the brush
|
2017-04-05 18:59:58 +02:00 |
|
ansuz
|
8bbbf8e252
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 17:28:11 +02:00 |
|
ansuz
|
64089c5f6b
|
implement pad pinning
|
2017-04-05 17:28:04 +02:00 |
|
yflory
|
d07acc5364
|
Don't redraw the drive if filesData changes while in unsorted
|
2017-04-05 16:08:39 +02:00 |
|
yflory
|
13514dff63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 15:00:10 +02:00 |
|
yflory
|
46a5eee597
|
Display the spinner in the toolbar for local changes
|
2017-04-05 14:57:07 +02:00 |
|
ansuz
|
6c7cdc90a9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:24:17 +02:00 |
|
ansuz
|
212baeb3a6
|
better cookie schema. expire old sessions
|
2017-04-05 12:24:01 +02:00 |
|
yflory
|
54d271c4e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-05 12:04:18 +02:00 |
|
yflory
|
a9777ce560
|
Fix input losing focus in polls with Chrome 57
|
2017-04-05 12:04:01 +02:00 |
|
ansuz
|
3484515283
|
enable more tests
|
2017-04-05 10:44:14 +02:00 |
|
ansuz
|
3e47b8a38d
|
remove dead code
|
2017-04-05 10:42:24 +02:00 |
|
ansuz
|
31b178a306
|
use pinpad api
|
2017-04-04 12:25:34 +02:00 |
|
ansuz
|
182dbfc874
|
implement pinning logic in pinpad.js
|
2017-04-04 12:13:31 +02:00 |
|
ansuz
|
a5e5ddae08
|
rpc all the things
|
2017-04-03 19:24:57 +02:00 |
|
ansuz
|
4f7e25eeb9
|
show labels for brush width
|
2017-04-03 10:43:57 +02:00 |
|
ansuz
|
2a6de5163b
|
jshint compliance
|
2017-03-31 18:54:50 +02:00 |
|
ansuz
|
04069cc7f4
|
fix font size
|
2017-03-31 13:28:30 +02:00 |
|
ansuz
|
1e51f89096
|
wipe the userdoc when the canvas is cleared
|
2017-03-31 12:01:52 +02:00 |
|
ansuz
|
e2981c0223
|
try to make the color picker show the current color
|
2017-03-31 12:01:30 +02:00 |
|
ansuz
|
96dac80bd5
|
better color picker in whiteboard
|
2017-03-31 11:02:59 +02:00 |
|
ansuz
|
bd07b3a80f
|
less cramped styling on text inputs on /settings/
|
2017-03-31 09:36:22 +02:00 |
|
ansuz
|
6e9968f989
|
add 'lol' code theme
|
2017-03-31 09:19:45 +02:00 |
|
ansuz
|
b85324a29e
|
jshint compliance
|
2017-03-31 09:18:57 +02:00 |
|
ansuz
|
73d4fd1700
|
handle reconnection attempts
|
2017-03-30 18:52:43 +02:00 |
|
ansuz
|
b07248ad42
|
prompt with setName if name is unset
|
2017-03-30 18:52:20 +02:00 |
|
ansuz
|
9b4b642d4a
|
protect against subtly corrupted user objects
|
2017-03-30 17:19:49 +02:00 |
|
ansuz
|
18469edf18
|
extend list item rendering to support gfm task lists
|
2017-03-30 12:02:31 +02:00 |
|
ansuz
|
055bc03092
|
strip carriage return
|
2017-03-30 12:00:46 +02:00 |
|
ansuz
|
bca13ad5a5
|
add notifications to whiteboard
|
2017-03-29 18:57:46 +02:00 |
|
ansuz
|
233bb7a14f
|
reorganize some html tags for smaller diffs
|
2017-03-29 18:38:06 +02:00 |
|
ansuz
|
76471f7b90
|
add forget button to whiteboard and handle disconnection better
|
2017-03-29 18:35:52 +02:00 |
|
ansuz
|
d4ce3dc6b9
|
don't rewrite css rules. FOUC is too long
|
2017-03-29 16:02:04 +02:00 |
|
ansuz
|
3cfd0a4326
|
commit some garbage
|
2017-03-29 15:40:34 +02:00 |
|
ansuz
|
364dae2882
|
update templated html
|
2017-03-29 12:56:08 +02:00 |
|
ansuz
|
ed89a13fe6
|
progress on adding version string to some css
|
2017-03-29 12:55:36 +02:00 |
|
ansuz
|
4d5baa717d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-29 11:56:13 +02:00 |
|
ansuz
|
76990ac1b2
|
version toolbar.css for cache-busting
|
2017-03-29 11:56:03 +02:00 |
|
ansuz
|
9d3f859657
|
add a contextMenu entry for the whiteboard app
|
2017-03-29 11:55:24 +02:00 |
|
yflory
|
7ede430db3
|
Fix 'search.oldLocation is undefined' error
|
2017-03-28 14:26:41 +02:00 |
|
ansuz
|
df7363f416
|
regenerate templated files for new footer
|
2017-03-28 11:50:42 +02:00 |
|
yflory
|
72fecb9549
|
Fix lint errors
|
2017-03-28 11:05:45 +02:00 |
|
yflory
|
af68e41fb6
|
Always set the focus to the search bar in the drive
|
2017-03-28 10:57:13 +02:00 |
|
yflory
|
67f4096396
|
Fix cursor in the drive search bar
|
2017-03-28 10:48:29 +02:00 |
|
yflory
|
12cc49b575
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-27 18:31:07 +02:00 |
|
yflory
|
72c60ec676
|
Add background to the whiteboard app
|
2017-03-27 18:30:48 +02:00 |
|
yflory
|
2732b7aa82
|
Fix module.onLocal not defined
|
2017-03-27 18:21:14 +02:00 |
|
ansuz
|
a0c17d7c9b
|
latest rpc code
|
2017-03-27 18:15:15 +02:00 |
|
yflory
|
4ddf9b4e04
|
Improve whiteboard UI
|
2017-03-27 18:12:11 +02:00 |
|
yflory
|
89877baa69
|
Fix read-only mode in canvas app
|
2017-03-27 17:15:54 +02:00 |
|
yflory
|
c2cb24c072
|
Add toolbar to the whiteboard app
|
2017-03-27 17:08:44 +02:00 |
|
ansuz
|
973aeba0da
|
remove bundled fabric.js
|
2017-03-27 12:48:54 +02:00 |
|
ansuz
|
6eab52c33d
|
use secure fabric.js
|
2017-03-27 12:45:39 +02:00 |
|
ansuz
|
59a80d5fde
|
remove silly TODO
|
2017-03-27 12:08:19 +02:00 |
|
ansuz
|
ce5dbaeafd
|
use alertify instead of browser prompt
|
2017-03-27 12:00:21 +02:00 |
|
yflory
|
71c59d7ae2
|
Remove unnecessary TODOs
|
2017-03-27 11:53:13 +02:00 |
|
yflory
|
d92a875ce5
|
Translate the 'wrong application' error message
|
2017-03-27 11:34:54 +02:00 |
|
yflory
|
a8ffac5dcd
|
Remove old code
|
2017-03-27 11:30:09 +02:00 |
|
yflory
|
5322eff607
|
Use the current values for the checkboxes in the print options dialog
|
2017-03-27 11:23:51 +02:00 |
|
yflory
|
53c60a31f6
|
Set the properties and backup inputs to read-only in the drive
|
2017-03-27 11:14:37 +02:00 |
|
yflory
|
0c5a930cb9
|
Fix an issue with the 'Properties' entry not always displayed in context menu
|
2017-03-27 10:58:23 +02:00 |
|
ansuz
|
3e9eb03e5a
|
display a user's public signing key in settings if it exists
|
2017-03-24 14:26:36 +01:00 |
|
ansuz
|
912215185f
|
add uid to userdata for better notifications
|
2017-03-24 13:32:42 +01:00 |
|
ansuz
|
fa9249ef29
|
don't notify for userlist changes if a user joins twice
|
2017-03-24 13:17:51 +01:00 |
|
ansuz
|
40f5e1706f
|
add a unique id to user objects, define a getter
|
2017-03-24 12:17:49 +01:00 |
|
ansuz
|
e2ee80d4e7
|
set icon for whiteboard app
|
2017-03-23 16:16:24 +01:00 |
|
ansuz
|
dbca94437e
|
rename canvas app to 'whiteboard'
|
2017-03-23 16:16:00 +01:00 |
|
yflory
|
994d640f8b
|
Fix an issue causing the lag icon to lose its color
|
2017-03-21 14:52:49 +01:00 |
|
yflory
|
819c7e3bae
|
Fix style issue with drag&drop in the active folder
|
2017-03-21 14:49:02 +01:00 |
|
yflory
|
6fbd1f0028
|
Store the dates as number and not strings to avoid ot issues
|
2017-03-21 14:46:40 +01:00 |
|
yflory
|
8556ce9d17
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-21 12:45:53 +01:00 |
|
yflory
|
8ce8401107
|
Fix issues with middle click in context menus
|
2017-03-21 12:45:39 +01:00 |
|
yflory
|
5f4990cc80
|
Display or hide the context menu in a more intuitive way with multiselect
|
2017-03-21 12:37:45 +01:00 |
|
yflory
|
51033ab70a
|
Remove useless links in the context menu and properties for readonly pads in the drive
|
2017-03-21 12:09:07 +01:00 |
|
ansuz
|
2b2e581779
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-21 11:47:27 +01:00 |
|
ansuz
|
2e8484ad4c
|
notes about what to improve. transform json on OT instead of just validating
|
2017-03-21 11:47:11 +01:00 |
|
yflory
|
7afde2309d
|
Add properties to the files not in the trash
|
2017-03-21 11:34:18 +01:00 |
|
yflory
|
61d33f2dd6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into prop
|
2017-03-21 10:44:10 +01:00 |
|
yflory
|
66a80ea50c
|
Add properties for pads in the drive
|
2017-03-20 18:59:27 +01:00 |
|
ansuz
|
b542245086
|
fix lint error
|
2017-03-20 18:11:26 +01:00 |
|
ansuz
|
cc43bb8362
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-20 18:05:39 +01:00 |
|
ansuz
|
98027dad27
|
jshint compliance
|
2017-03-20 18:02:11 +01:00 |
|
ansuz
|
eeecb1baab
|
Make Canvas Work Again
|
2017-03-20 18:01:13 +01:00 |
|
ansuz
|
4a173e30dc
|
set user's cursor to either the beginning or end of the document
|
2017-03-20 17:51:56 +01:00 |
|
yflory
|
29174b2922
|
Update the lag icon
|
2017-03-20 16:39:33 +01:00 |
|
yflory
|
26edb77cf0
|
Fix style and usability issues in slides
|
2017-03-20 15:20:42 +01:00 |
|
yflory
|
85105a1382
|
Active folder in drive is not underlined anymore
|
2017-03-20 14:16:44 +01:00 |
|
yflory
|
cd77f50717
|
Fix transitions in slides, add swipe event handlers, and fix print in firefox
|
2017-03-20 12:50:46 +01:00 |
|
yflory
|
e139295d7e
|
Add transitions in present mode
|
2017-03-17 18:39:39 +01:00 |
|
yflory
|
45ac3e40a2
|
Copy print options to present mode
|
2017-03-17 18:03:00 +01:00 |
|
yflory
|
a5f11d0d0d
|
Uniform the slides rendering in present and print mode
|
2017-03-17 15:30:27 +01:00 |
|
ansuz
|
d422c7e165
|
support old hashes in getUserChannelList
|
2017-03-16 17:14:54 +01:00 |
|
ansuz
|
7d5ff27900
|
better rpc tests, sum up your channel usage
|
2017-03-16 17:03:45 +01:00 |
|
ansuz
|
5ed6223313
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-16 14:47:03 +01:00 |
|
ansuz
|
7f2f1f7191
|
correctly initialize RPC object
|
2017-03-16 14:46:55 +01:00 |
|
ansuz
|
c9c9dd0999
|
use userChannelList if a list is not supplied to pinpad
|
2017-03-16 14:46:17 +01:00 |
|
ansuz
|
e8c3cf6aa5
|
implement rpc message signing
|
2017-03-16 14:45:38 +01:00 |
|
ansuz
|
d85a42c776
|
include User_hash in user channel list
|
2017-03-16 14:43:57 +01:00 |
|
yflory
|
f98c825dc3
|
Fix keyboard shortcuts not working in CryptDrive
|
2017-03-16 14:43:00 +01:00 |
|
yflory
|
7b27f1dc2c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-16 14:16:54 +01:00 |
|
yflory
|
7761aaa89f
|
Add search UI
|
2017-03-16 14:16:42 +01:00 |
|
ansuz
|
b578803136
|
clean up registration code a little bit
|
2017-03-16 10:37:16 +01:00 |
|
ansuz
|
c3c866fa2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:53 +01:00 |
|
yflory
|
d19bbcb001
|
Add support for search in the drive
|
2017-03-15 18:59:55 +01:00 |
|
ansuz
|
5eb32b33ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 18:59:38 +01:00 |
|
ansuz
|
298725b3c2
|
don't show usage tips on error screens
|
2017-03-15 18:58:39 +01:00 |
|
ansuz
|
0a6373852e
|
add signing keys to user object at login and register time
|
2017-03-15 18:57:13 +01:00 |
|
yflory
|
9a32fb1999
|
Fix sub-folders changing position in the tree when renaming them
|
2017-03-15 17:34:06 +01:00 |
|
yflory
|
931f7619c0
|
Keep the scroll position on redraw in drive
|
2017-03-15 17:30:52 +01:00 |
|
yflory
|
0607c3bbf3
|
Add a title to the 'new' button in drive
|
2017-03-15 17:20:08 +01:00 |
|
yflory
|
b9c64a526a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 17:15:03 +01:00 |
|
yflory
|
15e9af77bb
|
Remove the langauge selector from toolbar and add it in settings
|
2017-03-15 17:14:49 +01:00 |
|
ansuz
|
8129b8cdc1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-15 16:05:05 +01:00 |
|
ansuz
|
15a67afc75
|
jshint compliance
|
2017-03-15 16:04:52 +01:00 |
|
yflory
|
13d7b3cadc
|
Merge branch 'd' into staging
|
2017-03-15 16:01:29 +01:00 |
|
yflory
|
a286599f93
|
Fix fast reconnect, and add support for reconnecting ws in polls
|
2017-03-15 16:01:00 +01:00 |
|
ansuz
|
bd9efd7c04
|
provide examples of valid and invalid rpc calls
|
2017-03-15 15:56:32 +01:00 |
|
ansuz
|
7187d3c550
|
implement getUserChannelList
|
2017-03-15 15:55:55 +01:00 |
|
ansuz
|
306f6ce806
|
resolve merge-conflict with accounting branch
|
2017-03-14 15:52:04 +01:00 |
|
yflory
|
fe5e33a0ee
|
Fix loss of presentation position when updating slides
|
2017-03-14 15:42:42 +01:00 |
|
ansuz
|
805e26bc07
|
add a version footer to main pages
|
2017-03-14 14:34:13 +01:00 |
|
yflory
|
f10149db1c
|
Make sure the tip is always visible when the loading screen is removed
|
2017-03-14 12:49:22 +01:00 |
|
ansuz
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-14 12:40:25 +01:00 |
|
ansuz
|
09afba80db
|
add support for logging in from register page
|
2017-03-14 12:39:50 +01:00 |
|
yflory
|
16e5788011
|
Call the callback if we can't parse the local Drive to import it
|
2017-03-14 12:09:52 +01:00 |
|
ansuz
|
413d9a6f0b
|
add a style-callback to confirm
|
2017-03-14 12:01:42 +01:00 |
|
ansuz
|
5d88c3a436
|
newer registration code
|
2017-03-14 12:00:23 +01:00 |
|
ansuz
|
10bb11bff6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 19:32:15 +01:00 |
|
ansuz
|
803e57c958
|
add more parameters to confirm dialogs
|
2017-03-13 19:30:56 +01:00 |
|
yflory
|
ceaf757680
|
Allow right click on the CryptPad logo/link in the top left corner
|
2017-03-13 18:49:30 +01:00 |
|
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:38 +01:00 |
|
ansuz
|
df6298eeb6
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:17 +01:00 |
|
yflory
|
84c16c00ad
|
Fix click events not working on inputs in the drive tree
|
2017-03-13 15:53:13 +01:00 |
|
ansuz
|
07a2d8e189
|
apply translations on feedback page
|
2017-03-13 12:56:49 +01:00 |
|
yflory
|
ca9faa0056
|
Fix wrong translation keys
|
2017-03-13 11:52:48 +01:00 |
|
yflory
|
b7986ff6b1
|
Replace the spinner code with a font awesome spinner
|
2017-03-13 11:52:39 +01:00 |
|
ansuz
|
6e733b1329
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 10:59:20 +01:00 |
|
ansuz
|
d9996cc874
|
current work for pinning
|
2017-03-13 10:56:08 +01:00 |
|
ansuz
|
a7d61aa562
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 18:04:07 +01:00 |
|
ansuz
|
b3cc8da315
|
implement basic clientside RPC infrastructure
and provide a basic example for testing it
|
2017-03-10 18:03:52 +01:00 |
|
yflory
|
f94db93897
|
Improve the slides layout in print mode
|
2017-03-10 16:46:36 +01:00 |
|
ansuz
|
81027b4200
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 10:49:33 +01:00 |
|
yflory
|
2392167996
|
Export slides as PDF
|
2017-03-09 19:05:44 +01:00 |
|
yflory
|
4bac8ea0c7
|
Draw all the slides at once to allow reference links (fix #77)
|
2017-03-09 12:41:23 +01:00 |
|
yflory
|
459b18c97b
|
Add the loading screen in the HTML so that it is displayed before JS is loaded
|
2017-03-08 18:05:15 +01:00 |
|
yflory
|
404fa378e6
|
Move the store to the 'common' folder, it is not customizable anymore
|
2017-03-08 16:47:38 +01:00 |
|
yflory
|
a8d200ef2e
|
Don't redirect until realtime is synced when logging in
|
2017-03-08 16:15:31 +01:00 |
|
yflory
|
0c1efd361b
|
Make sure the href is updated everywhere when importing a stronger link
|
2017-03-08 15:49:02 +01:00 |
|
yflory
|
b701e3cc85
|
Fix lint errors
|
2017-03-08 14:59:51 +01:00 |
|
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
2017-03-08 14:45:39 +01:00 |
|
yflory
|
f62267f8a1
|
Ability to import local pads in the user object
|
2017-03-07 18:39:21 +01:00 |
|
ansuz
|
e2418a6be2
|
sketch of how pinning rpc will look
|
2017-03-07 17:33:31 +01:00 |
|
ansuz
|
dc567fa7f3
|
signing keys are stored in hex so encode and decode them
|
2017-03-07 17:30:32 +01:00 |
|
yflory
|
ce6cd1211e
|
Fix lint errors
|
2017-03-07 15:33:08 +01:00 |
|
ansuz
|
aa762e7d63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-07 15:33:01 +01:00 |
|
ansuz
|
8a48612de2
|
add some notes for later
|
2017-03-07 14:40:06 +01:00 |
|
yflory
|
9ad33574e9
|
Fix the function returning the pads list in the drive
|
2017-03-07 14:30:07 +01:00 |
|
yflory
|
14938089ac
|
Keep the focus on the iframe window after canceling a deletion
|
2017-03-07 14:24:06 +01:00 |
|
yflory
|
3f7dea8f7e
|
Context menu support for multi-select options in drive
|
2017-03-07 12:22:02 +01:00 |
|
yflory
|
e1c02fd8a4
|
Drive rename: save pads and folders name on click, cancel with Esc.
|
2017-03-06 18:15:14 +01:00 |
|
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
2017-03-06 17:20:09 +01:00 |
|
yflory
|
77d09f64e1
|
Display anonymous users in the user list
|
2017-03-06 14:56:41 +01:00 |
|
yflory
|
cb88227e2b
|
Autocomplete on key press in some dropdown menus
|
2017-03-06 12:20:23 +01:00 |
|
ansuz
|
c04819538b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 18:16:39 +01:00 |
|
ansuz
|
fcb9848b3a
|
hide toolbar when in read-only mode
|
2017-03-03 18:16:34 +01:00 |
|
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
2017-03-03 18:14:53 +01:00 |
|
yflory
|
27241488a5
|
Merge pull request #96 from pbondoer/css
(CSS) Some improvements to drive
|
2017-03-03 16:33:20 +01:00 |
|
Pierre Bondoerffer
|
6c9da646e0
|
(CSS) Some improvements to drive
|
2017-03-03 16:26:08 +01:00 |
|
ansuz
|
08c862b271
|
add FIXME notes to poll
|
2017-03-03 16:13:32 +01:00 |
|
yflory
|
ed9bcca96f
|
Close the websocket network when CryptGet/CryptPut is done
|
2017-03-03 12:48:00 +01:00 |
|
yflory
|
a68acac13b
|
Only ask for a display name once in /poll
|
2017-03-03 12:07:16 +01:00 |
|
yflory
|
a978b51656
|
If display name is empty, use anonymous in the drive
|
2017-03-03 12:06:35 +01:00 |
|
yflory
|
153386a6e0
|
CSS improvements in the drive tree
|
2017-03-02 18:24:18 +01:00 |
|
yflory
|
6098f28260
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 18:16:20 +01:00 |
|
yflory
|
a852112808
|
Fix open folder from the tree context menu
|
2017-03-02 18:16:16 +01:00 |
|
ansuz
|
2c9deed381
|
Merge pull request #94 from pbondoer/staging
Some CSS fixes
|
2017-03-02 18:15:30 +01:00 |
|
ansuz
|
868161a8a8
|
fix undefined reference in code
|
2017-03-02 17:59:59 +01:00 |
|
ansuz
|
0bb10a8a0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 17:59:35 +01:00 |
|
Pierre Bondoerffer
|
800db07077
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-02 17:44:29 +01:00 |
|
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
2017-03-02 17:40:29 +01:00 |
|
yflory
|
52793385ea
|
Fix lint errors
|
2017-03-02 17:17:55 +01:00 |
|
Pierre Bondoerffer
|
e39fe1c0b7
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-02 17:09:39 +01:00 |
|
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
2017-03-02 17:09:06 +01:00 |
|
ansuz
|
c884782d57
|
here are some changes
|
2017-03-02 17:08:50 +01:00 |
|
yflory
|
2b6e44189d
|
When trying to reset the drive, tell the user if the input text is invalid
|
2017-03-02 17:01:27 +01:00 |
|
yflory
|
9a7c2dd5e2
|
Add a 'settings' link to the user menu in static pages
|
2017-03-02 16:38:22 +01:00 |
|
yflory
|
370ae81106
|
Use the display name in the backup file name if not logged in
|
2017-03-02 16:29:17 +01:00 |
|
Pierre Bondoerffer
|
e0d972674f
|
Fix context menu in drive and rename textbox styling
|
2017-03-02 16:22:32 +01:00 |
|
yflory
|
c5f983ecd7
|
Convert read-only link to editing link in the drive
|
2017-03-02 16:01:34 +01:00 |
|
Pierre Bondoerffer
|
d26d8f53d9
|
(CSS) Fixed textarea being too large
|
2017-03-02 15:50:03 +01:00 |
|
ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
2017-03-02 11:38:20 +01:00 |
|
yflory
|
6b8d0c8bc7
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
2017-03-02 10:53:48 +01:00 |
|
yflory
|
b32d698291
|
Fix issue with present mode in slide (readonly)
|
2017-03-02 10:53:45 +01:00 |
|
yflory
|
8bdc8415ab
|
Find a pad in the drive
|
2017-03-02 10:15:13 +01:00 |
|
Caleb James DeLisle
|
91eda5fa83
|
Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
|
2017-03-01 21:06:53 +01:00 |
|
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
2017-03-01 17:05:57 +01:00 |
|
yflory
|
53f4f8826e
|
Merge branch 'staging' into staging
|
2017-03-01 16:32:18 +01:00 |
|
yflory
|
55210f17eb
|
Clean the code to be less dependant on 'li'
|
2017-03-01 16:15:48 +01:00 |
|
Pierre Bondoerffer
|
3e9c4d0901
|
Add hover to file manager tree
|
2017-03-01 15:57:22 +01:00 |
|
Pierre Bondoerffer
|
cbdfae09a6
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-01 15:53:48 +01:00 |
|
yflory
|
c6c3e1bbb5
|
Don't select subfolders in the tree when drag&drop
|
2017-03-01 15:53:31 +01:00 |
|
Pierre Bondoerffer
|
d605fc757b
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-01 15:46:49 +01:00 |
|
yflory
|
a26b9d3240
|
Don't select subfolders in the tree when right-click on drag&drop
|
2017-03-01 15:46:10 +01:00 |
|
ansuz
|
cb5e01815c
|
validate all alertify strings by default. require 'force' argument to bypass
|
2017-03-01 15:07:34 +01:00 |
|
Pierre Bondoerffer
|
b0323f6fd9
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-01 14:45:18 +01:00 |
|
yflory
|
a2b5200381
|
Add a container for the folders in the tree in the drive
|
2017-03-01 14:44:43 +01:00 |
|
yflory
|
412815b042
|
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
|
2017-03-01 13:10:55 +01:00 |
|
yflory
|
11d54256da
|
Make sure the display name is displayed in the same way everywhere
|
2017-03-01 13:10:06 +01:00 |
|
yflory
|
2c5c6da0d9
|
Fix XSS in alertify logs
|
2017-03-01 13:09:14 +01:00 |
|
yflory
|
5797aab3f2
|
Fix XSS with display names in the user list
|
2017-03-01 13:08:36 +01:00 |
|
yflory
|
26e3971482
|
Fix XSS in the user dropdown menu
|
2017-03-01 13:08:09 +01:00 |
|
ansuz
|
639376f1cb
|
don't use hyperjson.toString
|
2017-03-01 12:36:10 +01:00 |
|
Pierre Bondoerffer
|
eb9a39eb68
|
Add hover on elements in drive and make grid slightly prettier
|
2017-02-28 23:15:47 +01:00 |
|
yflory
|
f130fd0598
|
Fix horizontal scrollbar in edge
|
2017-02-28 18:02:12 +01:00 |
|
yflory
|
345d2faab2
|
Fix horizontal scrollbar in Edge #3
|
2017-02-28 17:13:51 +01:00 |
|
yflory
|
d683dc499a
|
Fix horizontal scrollbar in Edge #2
|
2017-02-28 17:03:23 +01:00 |
|
yflory
|
7a0a87bf6c
|
Fix horizontal scrollbar in Edge
|
2017-02-28 16:38:51 +01:00 |
|
yflory
|
f06196c261
|
Remove the context menu buttons when removing selection
|
2017-02-28 15:48:49 +01:00 |
|
yflory
|
c0278ba77f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 13:12:53 +01:00 |
|
yflory
|
efb7380a12
|
Fix default pad not created after registration
|
2017-02-28 13:12:27 +01:00 |
|
ansuz
|
5d39125004
|
Make onSettle Async Again
|
2017-02-28 13:12:04 +01:00 |
|
yflory
|
4f4075ed6e
|
Make the settings app available to anonymous users
|
2017-02-28 11:23:50 +01:00 |
|
yflory
|
0224d6489b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 11:06:50 +01:00 |