207 Commits (4cc5388c7610fc5f1de0229e84793ef10b14e951)

Author SHA1 Message Date
ansuz 2b8c21d292 set styles with setAttribute. fixes style fights 9 years ago
ansuz 1746a4e732 use crypto from bower 9 years ago
ansuz 2a3ff256b9 remove libraries which are now in bower 9 years ago
ansuz f72cb24fc5 rm LORIA 9 years ago
ansuz 2c3de49922 remove realtime-input, since it's in bower now 9 years ago
ansuz 2798d1b1f9 all of the list/map api's dependencies are now on bower 9 years ago
ansuz 58c968b319 minor cleanup in realtime-input 9 years ago
ansuz 288b4d5b66 depend on main passing in the crypto module for now 9 years ago
ansuz 85dbd5cb6e pass in websocketURL from main 9 years ago
ansuz d9a4f2f22c missed one 9 years ago
ansuz ff0f7d15dc use json-ot from bower 9 years ago
ansuz 58633af943 listmap can be reused. put it in common/ 9 years ago
ansuz dbf1e2b870 support reusing the netflux network
export more internals from realtime input
9 years ago
ansuz 83696495a8 use chainpad from bower, not local 9 years ago
ansuz 954ee26f4d fix undefined disconnect reason 9 years ago
ansuz 9336c4de5c import latest chainpad 9 years ago
ansuz 058548b95a revert my reversion
Revert "Revert "Added checkpoints with the new code from ChainPad""

This reverts commit 6e2e8bf21f.
9 years ago
ansuz 6e2e8bf21f Revert "Added checkpoints with the new code from ChainPad"
This reverts commit da2bfe2de9.
9 years ago
ansuz ce99bd9ba3 Merge branch 'two' of github.com:xwiki-labs/cryptpad into two 9 years ago
ansuz a0c73c95d8 do away with a bit of boilerplate 9 years ago
Caleb James DeLisle da2bfe2de9 Added checkpoints with the new code from ChainPad 9 years ago
ansuz cf85de6113 remove old bencoding code 9 years ago
ansuz d99bb8ff84 WIP : fallback to old parsing doesn't work 9 years ago
ansuz f04be53d11 fall back to old parsing if the message is bencoded? 9 years ago
ansuz 976a08cc7a move to chainpad version 2 9 years ago
ansuz cae750cd75 update padrtc for to use bower libraries 9 years ago
ansuz 7faf57602b implement log level settings from application layer 9 years ago
ansuz 523aff3067 use upstream chainpad.js 9 years ago
ansuz c752e4a6e5 remove sharejs 9 years ago
ansuz 6b2e986789 remove deprecated textsocket library 9 years ago
ansuz 150ebaba7b add ability to force text diffing 9 years ago
ansuz ba17b78f7a restyle name change button 9 years ago
Yann Flory 492054a938 Fix the cursor position when a remote patch is applied 9 years ago
Yann Flory 5bb2e12db2 Merge branch 'beta' into migrate 9 years ago
Yann Flory cc51e6d6ed Update CodeMirror pad to work with Netflux 9 years ago
Caleb James DeLisle 3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 9 years ago
Yann Flory 85d5f5c47f Convert netflux to es5 9 years ago
Caleb James DeLisle 5f16ad4a58 Update to most recent chainpad 9 years ago
ansuz aa07dd31ee have json-ot initialize its own debug module, instead of relying on a window variable's existence 9 years ago
Yann Flory 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
Yann Flory 8ac69ca262 Add a missing "time" property in the netflux client causing incorrect
timeout errors
9 years ago
ansuz b140b6429d remove a little bit of dead code 9 years ago
ansuz bbdc9da853 delete duplicated file 9 years ago
ansuz 5f4825f3a0 don't change the hash from realtime input
let applications handle that logic
9 years ago
ansuz 4f426651ad remove TextPatcher from RealtimeTextSocket 9 years ago
ansuz 02ff1a63a4 Merge branch 'netflux' into beta
Conflicts:
	www/assert/main.js
9 years ago
ansuz a18c793f98 use latest hyperjson 9 years ago
ansuz 9efcc443cd add 'format' to TextPatcher's API 9 years ago
ansuz 0769e50414 move TextPatcher to highest application layer 9 years ago
ansuz 1d70335228 provide all callbacks before starting 9 years ago