Caleb James DeLisle
b372b0b77c
small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state
2016-03-25 17:35:07 +01:00
Caleb James DeLisle
f3fb674504
Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax
2016-03-25 16:50:17 +01:00
Caleb James DeLisle
98c85cef8b
xxx
2016-03-25 16:49:27 +01:00
ansuz
12dcbc9121
fix quick red fox and make test.cancel work again
2016-03-25 16:14:17 +01:00
Caleb James DeLisle
62eabbc7ae
If a message does not match parent hash, don't delete it from storage
2016-03-25 15:23:19 +01:00
Caleb James DeLisle
dbf31798d5
json-ot triggering PARANOIA errors in ChainPad
2016-03-25 15:01:17 +01:00
Caleb James DeLisle
03932d0169
small changes to chainpad for testing
2016-03-25 14:52:44 +01:00
Caleb James DeLisle
669bcc1935
If there is a difference in the hjson then send a message back
2016-03-25 14:26:31 +01:00
Caleb James DeLisle
f62ec85a4c
Shuffled around some assertions and logs
2016-03-25 14:14:19 +01:00
Caleb James DeLisle
420a7098a6
more testing and crap
2016-03-25 12:45:51 +01:00
ansuz
4b35a145e3
Push WIP
2016-03-25 11:04:27 +01:00
ansuz
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.
2016-03-24 12:50:04 +01:00
ansuz
e066730b68
add notes about how hyperjson is to be used
2016-03-24 12:46:35 +01:00
ansuz
cd462ed872
Merge legacy websocket version
2016-03-24 12:28:45 +01:00
ansuz
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
2016-03-24 12:16:42 +01:00
ansuz
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.
2016-03-24 12:11:31 +01:00
ansuz
475ca9bea8
hyperjson.js : used split instead of filter... oops
2016-03-23 12:33:05 +01:00
ansuz
1bd5cb9e27
hyperjson.js : used split instead of filter... oops
2016-03-23 12:31:16 +01:00
ansuz
b2753ef7b7
fix string manipulation off-by-one
2016-03-22 19:29:58 +01:00
ansuz
f98fda7604
fix string manipulation off-by-one
2016-03-22 19:28:50 +01:00
ansuz
4f3fcb08a4
better error reporting when the operational transform fails to parse JSON
2016-03-22 12:13:15 +01:00
ansuz
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.
2016-03-22 12:13:01 +01:00
ansuz
fbe6225681
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
2016-03-22 12:12:46 +01:00
ansuz
0c6222b5f9
better error reporting when the operational transform fails to parse JSON
2016-03-22 10:19:13 +01:00
ansuz
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.
2016-03-22 10:16:14 +01:00
ansuz
bd24821c6c
Don't attempt to use the cursor selection when it has length 0
...
RTWYSIWYG-20
RTWYSIWYG-24
2016-03-22 10:06:42 +01:00
Yann Flory
de6db0285c
Limit the size of the usernames to 32 chars
2016-03-16 17:48:27 +01:00
Yann Flory
38d797a4f1
Fix issue with Chrome and WebRTC
2016-03-16 17:38:26 +01:00
Yann Flory
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
2016-03-16 17:09:08 +01:00
Yann Flory
c7d190f1c0
Improve the server so that both protocol (WebSocket and WebRTC) can use the same port
2016-03-16 16:34:27 +01:00
Yann Flory
7ee75b9e7f
Messages received by the WebSocket server are now saved in a file
2016-03-16 14:59:05 +01:00
Yann Flory
e77d85bc82
Trigger an onReady() method when the user's pad is fully synced (the history is loaded)
2016-03-16 14:00:14 +01:00
Yann Flory
eca4ec699c
Ability to change the username (the user ID is displayed by default)
2016-03-16 12:02:39 +01:00
Yann Flory
6e50ae94dd
Remove unused code
2016-03-15 10:51:19 +01:00
Yann Flory
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
2016-03-15 10:37:27 +01:00
Yann Flory
3a188625e0
Improve the detection of a disconnected peer to update the user list with the WebRTC service
2016-03-14 15:20:00 +01:00
Yann Flory
77e7fb5724
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
2016-03-14 14:49:19 +01:00
Yann Flory
06e5c84702
Clean some code
2016-03-11 17:32:45 +01:00
Yann Flory
29033f344c
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
2016-03-11 17:15:55 +01:00
Yann Flory
b1e8bcddef
Fix the user list not working with the WebRTC service and causing major issues
2016-03-11 17:09:27 +01:00
Yann Flory
c576241104
Add a Chainpad adapter to make Chainpad know the userList
2016-03-10 18:48:38 +01:00
ansuz
ffef837326
Merge branch 'diffdom'
2016-03-10 14:14:50 +01:00
ansuz
a9f088710c
also ignore webrtc server
2016-03-10 14:11:03 +01:00
ansuz
8e41f43802
ignore netflux socket server since it has ES6
2016-03-10 14:10:11 +01:00
ansuz
fb0e82931d
correct malformed json
2016-03-10 14:08:15 +01:00
ansuz
82b86879d2
ignore netflux since it's ecma6 and not our code
2016-03-10 14:07:13 +01:00
Yann Flory
996261f9db
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
2016-03-10 14:05:29 +01:00
Yann Flory
ae8f6f7f2c
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
2016-03-10 14:03:31 +01:00
ansuz
8efbc2611d
ignore netflux since it's ecma6 and not our code
2016-03-10 12:01:14 +01:00
ansuz
5cd118bdb0
ignore netflux since it's ecma6 and not our code
2016-03-10 12:00:36 +01:00
