Commit Graph

9800 Commits (02966d0a5d463b7287f6a4da21dc9012e445318f)
 

Author SHA1 Message Date
ansuz 7c4b334ad3 here's a canvas app!
ansuz 41276fffb5 repair /text/ application, conform to new API
ansuz cb979844f6 implement text patching at application layer
ansuz 4a41575e6d accept onLocal in config
ansuz d3c2c901b6 implement cursor transformation in a common library
ansuz b71f73455d Add a working picture
ansuz fe1daa5caf Write a document detailing system architecture
ansuz 92d89f6cac start to factor sharejs into two modules
ansuz 13dc77b7f6 remove commented line
ansuz 41e635b2e5 realtime-input.js : turn on logging
Yann Flory 69e8e18283 Remove the pipe character in the hash
ansuz d62e9fc1c9 add a missing semicolon
ansuz 4095201d15 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
Yann Flory c32045d7d0 Fix an issue with missing characters when several users were typing at the same time
ansuz 822b2bd2b9 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate
Yann Flory be09a1808d Remove old code from realtime-input
ansuz 5a5b9ad718 Merge branch 'netflux' into beta
ansuz 4af987a2a2 point to correct toolbar.js
ansuz 3ade46adc7 Merge branch 'newtests' into beta
Yann Flory 6884b0890a Fix the typong tests not working properly
ansuz b12a01e08f report test results on the page, not in the console
ansuz c8dabbd6e7 Merge pull request from xwiki-labs/sortify
Merge pull request  from xwiki-labs/beta
ansuz 9a33e7cbf0 Merge pull request from xwiki-labs/beta
Beta
ansuz feaae609ad fix broken path for padrtc
Yann Flory ecc41d14af Use canonical serializer for json serialization
ansuz fc77ef66b3 Merge remote-tracking branch 'origin/sortify' into HEAD
utilize canonical stringify function

Conflicts:
	www/_socket/main.js
Caleb James DeLisle 319f5b95f7 Use canonical serializer for json serialization
Yann Flory 9683fd9aec Always serialize the DOM in one way.
Caleb James DeLisle 698338b49a Use canonical serializer for json serialization
ansuz 6dabded135 correct path for having renamed _socket
Yann Flory e207d8b579 Merge branch 'diffdom' into netflux
ansuz 468827dadd newest tests
ansuz c867ab04ab rename /_socket/ app to /p/
ansuz a1fe941f69 Always serialize the DOM in one way.
ansuz f4c5b2a996 Add sane defaults to TextPatcher diffs
ansuz 259772dd62 Turn on TextPatcher logging for _socket
ansuz 0537c28919 Add switchable logging to TextPatcher.js
Caleb James DeLisle 8a36963582 Enable ChainPad PARANOIA mode but remove the part which causes most slowness
ansuz 284da6a4e9 minor improvements I made to the /hack/ pad last night
ansuz 9f0cc4ed64 update hack with a slightly better UI
ansuz 71c0a06c3b Merge branch 'hack' into diffdom
ansuz 19cd991dba trim dead code, comment, very minor optimizations
ansuz f75c246029 remove dead code from pad/main.js
ansuz 9f45ccb2d9 use console.error for stack traces
ansuz d705b947ab Merge branch 'diffdom' into netflux
basic cleanup while performing a larger merge between two prototypes
ansuz 2ffa69dc15 remove checks for a non-existent race condition
ansuz 368d72b337 add missing semicolons to TextPatcher.js
ansuz 2fdb4c1255 ignore external files and anything relying on es6
merge differences from netflux

Conflicts:
	.jshintignore
ansuz 851ccfbdb6 detect falsey operations in OT and ignore them
ansuz 400f6efde1 json-ot.js : jshint compliance