e3b78e20de
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
9 years ago
e26246178f
start to clean up and give things more sensible names.
...
get rid of the textarea entirely
9 years ago
b372b0b77c
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
9 years ago
f3fb674504
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
9 years ago
98c85cef8b
xxx
9 years ago
12dcbc9121
fix quick red fox and make test.cancel work again
9 years ago
62eabbc7ae
If a message does not match parent hash, don't delete it from storage
9 years ago
dbf31798d5
json-ot triggering PARANOIA errors in ChainPad
9 years ago
03932d0169
small changes to chainpad for testing
9 years ago
669bcc1935
If there is a difference in the hjson then send a message back
9 years ago
f62ec85a4c
Shuffled around some assertions and logs
9 years ago
420a7098a6
more testing and crap
9 years ago
4b35a145e3
Push WIP
9 years ago
42c972116b
leave TODO re: diffDOM and magicline
...
Hyperjson guarantees that magicline elements are not sent across the wire.
DiffDOM must guarantee that magicline elements will not be removed on remote edits.
9 years ago
e066730b68
add notes about how hyperjson is to be used
9 years ago
cd462ed872
Merge legacy websocket version
9 years ago
c047d5310f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
Conflicts:
www/common/convert.js
9 years ago
0d33af773f
implement optional filtering in hyperjson
...
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
9 years ago
475ca9bea8
hyperjson.js : used split instead of filter... oops
9 years ago
1bd5cb9e27
hyperjson.js : used split instead of filter... oops
9 years ago
b2753ef7b7
fix string manipulation off-by-one
9 years ago
f98fda7604
fix string manipulation off-by-one
9 years ago
4f3fcb08a4
better error reporting when the operational transform fails to parse JSON
9 years ago
0ff4906f0e
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
9 years ago
fbe6225681
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
0c6222b5f9
better error reporting when the operational transform fails to parse JSON
9 years ago
79a9998b13
implement better serialization of class names
...
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
selectors which hyperscript could not parse.
9 years ago
bd24821c6c
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
9 years ago
de6db0285c
Limit the size of the usernames to 32 chars
9 years ago
38d797a4f1
Fix issue with Chrome and WebRTC
9 years ago
7237c751d5
Move 'vdom' to the main 'pad'.
...
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
9 years ago
e77d85bc82
Trigger an onReady() method when the user's pad is fully synced (the history is loaded)
9 years ago
eca4ec699c
Ability to change the username (the user ID is displayed by default)
9 years ago
6e50ae94dd
Remove unused code
9 years ago
5da8560e22
Fix the user list in the toolbar keeping old data with the WebSocket server
...
Chainpad is no longer responsible for the userlist or the ping
9 years ago
3a188625e0
Improve the detection of a disconnected peer to update the user list with the WebRTC service
9 years ago
77e7fb5724
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
9 years ago
06e5c84702
Clean some code
9 years ago
29033f344c
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
9 years ago
b1e8bcddef
Fix the user list not working with the WebRTC service and causing major issues
9 years ago
c576241104
Add a Chainpad adapter to make Chainpad know the userList
9 years ago
fb0e82931d
correct malformed json
9 years ago
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
9 years ago
3a7af63c54
correct malformed json
9 years ago
b7885eb539
Fix channel history
9 years ago
136e2d8cf2
pass in missing textarea argument so textpad starts working again
9 years ago
8258018c1d
Revert "fix undefined reference"
...
This reverts commit 7d65540123
9 years ago
c67451bc1a
Revert "remove broken functions from convert module"
...
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f
9 years ago
c536ecbc1c
Temp commit
9 years ago
870b2dbb7e
Add the WebRTC server in Cryptpad
9 years ago
c4f62fb812
First try with WebRTC
9 years ago
09a06a8bc5
Replace the chainpad server by the netflux server
9 years ago
60c3aceb0d
Add chatflux server
9 years ago
deb2084fc5
Add the socket connection checker
9 years ago
d3e2a2f52e
make verbose logging switchable via a conditional
9 years ago
1c54af69a1
update minor editors to use new realtime-input api
9 years ago
9b228eea6b
modify vdom main.js to adhere to new realtime-input api
9 years ago
fefb904261
realtime input changes
9 years ago
fd99dba4a3
modify realtime-input api to take a single object as configuration. merge netflux API
9 years ago
62ba579d4a
Add Netflux API with WebSocket service V1
9 years ago
53d3e475f7
ui hints for hackpad
9 years ago
d2f4fbcee9
fail the toolbar from the application layer
9 years ago
d7b34cf6be
don't call toolbar from within realtime-input.js
9 years ago
e8469ae1bb
test out extended realtime-input api
9 years ago
5e1566eaec
fix incomplete 'onAbort' block
9 years ago
52fe892bae
invert logical relationship with flag
...
otherwise updates don't actually propogate
9 years ago
938df2b92f
lock the editor until the chain has synced
...
add 'onAbort' hook. lock the editor if the connection fails.
9 years ago
1d6ccc99a1
add 'onAbort' hook to realtime-input.js
9 years ago
e5bef52850
reintroduce the toolbar
9 years ago
6ff5b10486
remove local diffDOM version
9 years ago
93fb944e1f
remove broken functions from convert module
9 years ago
7d65540123
fix undefined reference
9 years ago
c246adc57b
Lock contenteditable until chain is done syncing.
...
Don't bother patching the dom until the chain has synced
9 years ago
1c0074258c
go back to using diffDOM from bower
...
The latest version is required. You'll need to update.
9 years ago
79bd82a62e
main.js : integrate with patched diffDOM
9 years ago
6884fabda9
Use local diffDOM instead of bower_components
...
At least until the PR gets accepted
9 years ago
f5a8727254
remove some unused functions from cursor.js
9 years ago
db1515c445
cursor.js : commit before cleaning up
9 years ago
7e367e770e
resize vdom debug panel to 30% width
9 years ago
91ada5ce7a
export Operation from chainpad. for use with OT
9 years ago
5425699f43
check if possible parent exists before checking if it contains another element
9 years ago
67bdb8a65a
fix a bad regex that occasionally threw an error
...
'nothing to repeat'
9 years ago
e87a4599a4
main.js : tiny patch until things are working correctly.
9 years ago
9ce59c985f
only do stuff with the cursor when a remote edit takes place
9 years ago
39f56d4fd1
throw error when checking for the index of a node that has no parent.
...
it probably isn't in the dom if this is the case.
Check if it's there before using this function
9 years ago
de46be85ba
add better helpers for finding and resetting the cursor
9 years ago
7e7f1fee76
include abstracted json-ot, add comments, start to use cursor stuff
9 years ago
c09036bd29
snapshot cursor.js, as some things are working quite well now
9 years ago
4eee1f5210
add orderOfNodes function to tree library
9 years ago
7689151fc0
pull json validation for OT into its own module for reuse
9 years ago
fbb9163e42
main.js : clean up and commit before making big-ish changes for cursor fixing
9 years ago
2c8a2406c6
cursor.js : snapshot before code deletion
9 years ago
1beb3f5355
snapshot of treesome.js before deletion
9 years ago
8ead5ca129
realtime-input.js : add notes regarding integration of the netflux api
9 years ago
3cb94b8d80
jshint compliance
9 years ago
d1885fbab6
better jshint compliance for common files
9 years ago
539cc3a2fa
remove unused files from common directory
9 years ago
afa2811472
remove local version of marked.js, prefer bower version
9 years ago
587f95b6d7
don't overflow
9 years ago
a01331cb9a
hide styling textarea no matter what
9 years ago
ansuz