2c3de49922
remove realtime-input, since it's in bower now
9 years ago
2798d1b1f9
all of the list/map api's dependencies are now on bower
9 years ago
58c968b319
minor cleanup in realtime-input
9 years ago
288b4d5b66
depend on main passing in the crypto module for now
9 years ago
85dbd5cb6e
pass in websocketURL from main
9 years ago
d9a4f2f22c
missed one
9 years ago
ff0f7d15dc
use json-ot from bower
9 years ago
58633af943
listmap can be reused. put it in common/
9 years ago
dbf1e2b870
support reusing the netflux network
...
export more internals from realtime input
9 years ago
83696495a8
use chainpad from bower, not local
9 years ago
954ee26f4d
fix undefined disconnect reason
9 years ago
9336c4de5c
import latest chainpad
9 years ago
058548b95a
revert my reversion
...
Revert "Revert "Added checkpoints with the new code from ChainPad""
This reverts commit 6e2e8bf21f
9 years ago
6e2e8bf21f
Revert "Added checkpoints with the new code from ChainPad"
...
This reverts commit da2bfe2de9
9 years ago
ce99bd9ba3
Merge branch 'two' of github.com:xwiki-labs/cryptpad into two
9 years ago
a0c73c95d8
do away with a bit of boilerplate
9 years ago
da2bfe2de9
Added checkpoints with the new code from ChainPad
9 years ago
cf85de6113
remove old bencoding code
9 years ago
d99bb8ff84
WIP : fallback to old parsing doesn't work
9 years ago
f04be53d11
fall back to old parsing if the message is bencoded?
9 years ago
976a08cc7a
move to chainpad version 2
9 years ago
cae750cd75
update padrtc for to use bower libraries
9 years ago
7faf57602b
implement log level settings from application layer
9 years ago
523aff3067
use upstream chainpad.js
9 years ago
c752e4a6e5
remove sharejs
9 years ago
6b2e986789
remove deprecated textsocket library
9 years ago
150ebaba7b
add ability to force text diffing
9 years ago
ba17b78f7a
restyle name change button
9 years ago
492054a938
Fix the cursor position when a remote patch is applied
9 years ago
5bb2e12db2
Merge branch 'beta' into migrate
9 years ago
cc51e6d6ed
Update CodeMirror pad to work with Netflux
9 years ago
3b6fe44378
Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
9 years ago
85d5f5c47f
Convert netflux to es5
9 years ago
5f16ad4a58
Update to most recent chainpad
9 years ago
aa07dd31ee
have json-ot initialize its own debug module, instead of relying on a window variable's existence
9 years ago
d3203d1c2a
Remove Crypto from the modules loaded with RequireJS in realtime-input
...
It now has to be passed in the config in the main JS file
9 years ago
8ac69ca262
Add a missing "time" property in the netflux client causing incorrect
...
timeout errors
9 years ago
b140b6429d
remove a little bit of dead code
9 years ago
bbdc9da853
delete duplicated file
9 years ago
5f4825f3a0
don't change the hash from realtime input
...
let applications handle that logic
9 years ago
4f426651ad
remove TextPatcher from RealtimeTextSocket
9 years ago
02ff1a63a4
Merge branch 'netflux' into beta
...
Conflicts:
www/assert/main.js
9 years ago
a18c793f98
use latest hyperjson
9 years ago
9efcc443cd
add 'format' to TextPatcher's API
9 years ago
0769e50414
move TextPatcher to highest application layer
9 years ago
1d70335228
provide all callbacks before starting
9 years ago
a3787ee4dc
Merge branch 'netflux' into beta
9 years ago
010566d3c3
pushDelta was mistakenly deprecated. restored.
9 years ago
3598c93098
move new hyperjson into common
9 years ago
103bb69daa
move custom hyperscript into common
9 years ago
b83fb7b823
improve brFix logic
...
stop exporting functions which we wish to deprecate
9 years ago
cb979844f6
implement text patching at application layer
9 years ago
4a41575e6d
accept onLocal in config
9 years ago
d3c2c901b6
implement cursor transformation in a common library
9 years ago
92d89f6cac
start to factor sharejs into two modules
9 years ago
13dc77b7f6
remove commented line
9 years ago
41e635b2e5
realtime-input.js : turn on logging
9 years ago
69e8e18283
Remove the pipe character in the hash
9 years ago
d62e9fc1c9
add a missing semicolon
9 years ago
c32045d7d0
Fix an issue with missing characters when several users were typing at the same time
9 years ago
be09a1808d
Remove old code from realtime-input
9 years ago
6884b0890a
Fix the typong tests not working properly
9 years ago
e207d8b579
Merge branch 'diffdom' into netflux
9 years ago
f4c5b2a996
Add sane defaults to TextPatcher diffs
9 years ago
259772dd62
Turn on TextPatcher logging for _socket
9 years ago
0537c28919
Add switchable logging to TextPatcher.js
9 years ago
8a36963582
Enable ChainPad PARANOIA mode but remove the part which causes most slowness
9 years ago
19cd991dba
trim dead code, comment, very minor optimizations
9 years ago
9f45ccb2d9
use console.error for stack traces
9 years ago
368d72b337
add missing semicolons to TextPatcher.js
9 years ago
851ccfbdb6
detect falsey operations in OT and ignore them
9 years ago
400f6efde1
json-ot.js : jshint compliance
9 years ago
ca94d30386
detect falsey operations in OT and ignore them
9 years ago
9f9cd8d8cd
realtime-input.js : fixes for jshint compliance
9 years ago
793149a608
json-ot.js : jshint compliance
9 years ago
06a3b63923
jshint compliance for toolbar.js
9 years ago
5cead3fad3
add missing semicolons to TextPatcher.js
9 years ago
94e57e4a26
update location of text-patcher.js
9 years ago
b37dab1f49
Merge branch 'diffdom' into netflux
...
Simple cleanup and unit tests
9 years ago
6b9d982d40
stabilize _socket/realtime-input.js
...
...as common/RealtimeTextSocket.js
9 years ago
39071021eb
stabilize typingTest.js as /common/TypingTests.js
9 years ago
9805958ad7
stabilize text-patcher.js into /common/TextPatcher.js
9 years ago
7782069dbd
Merge pull request #15 from xwiki-labs/diffdom
...
merge diffdom into netflux
9 years ago
a1f9b10175
remove offending line from chainpad entirely
...
RTCHAINPAD-3
9 years ago
4ba68eb2bf
fix leaky variable in chainpad
...
Patch.transform declared a 'toTransform' variable without using 'var'
this caused it to leak onto the window during operational transformations
9 years ago
05108efdfa
correct chainpad's transformation function
...
addresses RTCHAINPAD-3
Pending further testing, this change will still need
to be corrected in https://github.com/xwiki-contrib/chainpad/
9 years ago
713c90242b
Hide the usernames when they have not been changed
9 years ago
0b3d6e15b8
Replace the Netflux old client (netflux.js) by the Netflux2 client.
...
Move the WebRTC peer-to-peer use case in /padrtc, which still uses the old
Netflux client
Use es6-promises.min.js to solve a issue with some browser and the new
Netflux client
9 years ago
cf9f60bd57
The server don't send back anymore messages to their sender
9 years ago
eb4ea7a6b0
Remove the content from the ACK messages sent by the server
9 years ago
ba4faea939
Update the pads to run with the latest improvements to the websocket server
9 years ago
5ef7e29a9b
Add the latest changes from _socket into the netflux pad
9 years ago
b59a14c5ac
merge hyperjson changes from realtime xwiki
...
more resilient class serialization.
comments
9 years ago
b41f0e8c50
Merge branch 'cjd-fixed-it-with-hax' into netflux2
9 years ago
c50690349b
comments describing the role of each argument
9 years ago
96e03fcfa4
Use latest chainpad without mutations
9 years ago
d5772c6315
when json-ot produces json that fails to parse...
...
export the relevant data to a window variable so we can inspect it better
9 years ago
6c340a6527
chainpad testing = true, reject non-compliant messages
9 years ago
afa1104d85
Pull the cursor out of bogus BR tarpits when it gets stuck
9 years ago
bac0e0ff88
implement hyperjson filtering
9 years ago
ansuz