Commit Graph

12717 Commits (a7e4da4e53363bf3269d94e51d95ac8c2d9eec9c)
 

Author SHA1 Message Date
ansuz 5db487db3f remove old pad entirely
hyperjson version is considered a strict improvement
ansuz 010566d3c3 pushDelta was mistakenly deprecated. restored.
ansuz 7adc7eef22 Merge pull request from xwiki-labs/integrate
Integrate
ansuz 1639c5b099 use hyperscript and hyperjson from common
ansuz 3598c93098 move new hyperjson into common
ansuz 103bb69daa move custom hyperscript into common
ansuz e357549eda push browser fights into an array for inspection
ansuz b83fb7b823 improve brFix logic
stop exporting functions which we wish to deprecate
ansuz 1c7954ed51 Grab Fabric off of the window
ansuz 06786b6e02 Remove redundant declaration
ansuz df22c246c4 serialize text nodes correctly
ansuz 302b8c5f04 Merge branch 'master' of github.com:xwiki-labs/cryptpad into integrate
ansuz 7ca5f47d02 remove multitest pad since it offers no significant benefit
ansuz bafdd588dd fix /hack/ to not require sharejs textarea
ansuz f2db6b83eb better sizing for palette options
ansuz 5ce158d2e2 add more colors
ansuz cc1814544d install fabricjs
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/