7616 Commits (a1a2e6659ec2dfbf26a066bc7a60c6338a1530e2)
 

Author SHA1 Message Date
ansuz 010566d3c3 pushDelta was mistakenly deprecated. restored. 9 years ago
ansuz 7adc7eef22 Merge pull request #18 from xwiki-labs/integrate
Integrate
9 years ago
ansuz 1639c5b099 use hyperscript and hyperjson from common 9 years ago
ansuz 3598c93098 move new hyperjson into common 9 years ago
ansuz 103bb69daa move custom hyperscript into common 9 years ago
ansuz e357549eda push browser fights into an array for inspection 9 years ago
ansuz b83fb7b823 improve brFix logic
stop exporting functions which we wish to deprecate
9 years ago
ansuz 1c7954ed51 Grab Fabric off of the window 9 years ago
ansuz 06786b6e02 Remove redundant declaration 9 years ago
ansuz df22c246c4 serialize text nodes correctly 9 years ago
ansuz 302b8c5f04 Merge branch 'master' of github.com:xwiki-labs/cryptpad into integrate 9 years ago
ansuz 7ca5f47d02 remove multitest pad since it offers no significant benefit 9 years ago
ansuz bafdd588dd fix /hack/ to not require sharejs textarea 9 years ago
ansuz f2db6b83eb better sizing for palette options 9 years ago
ansuz 5ce158d2e2 add more colors 9 years ago
ansuz cc1814544d install fabricjs 9 years ago
ansuz 7c4b334ad3 here's a canvas app! 9 years ago
ansuz 41276fffb5 repair /text/ application, conform to new API 9 years ago
ansuz cb979844f6 implement text patching at application layer 9 years ago
ansuz 4a41575e6d accept onLocal in config 9 years ago
ansuz d3c2c901b6 implement cursor transformation in a common library 9 years ago
ansuz b71f73455d Add a working picture 9 years ago
ansuz fe1daa5caf Write a document detailing system architecture 9 years ago
ansuz 92d89f6cac start to factor sharejs into two modules 9 years ago
ansuz 13dc77b7f6 remove commented line 9 years ago
ansuz 41e635b2e5 realtime-input.js : turn on logging 9 years ago
Yann Flory 69e8e18283 Remove the pipe character in the hash 9 years ago
ansuz d62e9fc1c9 add a missing semicolon 9 years ago
ansuz 4095201d15 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate 9 years ago
Yann Flory c32045d7d0 Fix an issue with missing characters when several users were typing at the same time 9 years ago
ansuz 822b2bd2b9 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into integrate 9 years ago
Yann Flory be09a1808d Remove old code from realtime-input 9 years ago
ansuz 5a5b9ad718 Merge branch 'netflux' into beta 9 years ago
ansuz 4af987a2a2 point to correct toolbar.js 9 years ago
ansuz 3ade46adc7 Merge branch 'newtests' into beta 9 years ago
Yann Flory 6884b0890a Fix the typong tests not working properly 9 years ago
ansuz b12a01e08f report test results on the page, not in the console 9 years ago
ansuz c8dabbd6e7 Merge pull request #17 from xwiki-labs/sortify
Merge pull request #16 from xwiki-labs/beta
9 years ago
ansuz 9a33e7cbf0 Merge pull request #16 from xwiki-labs/beta
Beta
9 years ago
ansuz feaae609ad fix broken path for padrtc 9 years ago
Yann Flory ecc41d14af Use canonical serializer for json serialization 9 years ago
ansuz fc77ef66b3 Merge remote-tracking branch 'origin/sortify' into HEAD
utilize canonical stringify function

Conflicts:
	www/_socket/main.js
9 years ago
Caleb James DeLisle 319f5b95f7 Use canonical serializer for json serialization 9 years ago
Yann Flory 9683fd9aec Always serialize the DOM in one way. 9 years ago
Caleb James DeLisle 698338b49a Use canonical serializer for json serialization 9 years ago
ansuz 6dabded135 correct path for having renamed _socket 9 years ago
Yann Flory e207d8b579 Merge branch 'diffdom' into netflux 9 years ago
ansuz 468827dadd newest tests 9 years ago
ansuz c867ab04ab rename /_socket/ app to /p/ 9 years ago
ansuz a1fe941f69 Always serialize the DOM in one way. 9 years ago