488 Commits (9dc23b54bfb42e9245688301c770902068223e84)

Author SHA1 Message Date
ansuz 663c157e2a expose text patcher to the window via APP 9 years ago
ansuz 1769ca16dc add example for configuring the logLevel in /pad/ 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 dcd130cd9d use hyperjson from bower in padrtc 9 years ago
ansuz c752e4a6e5 remove sharejs 9 years ago
ansuz 6b2e986789 remove deprecated textsocket library 9 years ago
ansuz d2fa5e8f70 start using hyperjson from bower.io 9 years ago
ansuz 150ebaba7b add ability to force text diffing 9 years ago
ansuz aef6f3a85b lock codemirror editor until chain has synced 9 years ago
ansuz 6736335db2 add 'made with <3' toolbar to code 9 years ago
ansuz 506a703b7d turn off TextPatcher logging on /pad/ 9 years ago
ansuz ba17b78f7a restyle name change button 9 years ago
ansuz d79b3616c9 remove unused files 9 years ago
ansuz 4c84758265 disable textpatcher logging 9 years ago
ansuz 46b009d20f remove last non-netflux pad 9 years ago
ansuz 18e0131d6e Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta 9 years ago
ansuz 32d1807350 import unused functions from /p/, to be integrated later 9 years ago
Yann Flory 492054a938 Fix the cursor position when a remote patch is applied 9 years ago
ansuz 626ecaffcd log browser fights in /pad/ 9 years ago
Yann Flory 5bb2e12db2 Merge branch 'beta' into migrate 9 years ago
ansuz afe78dad56 Merge branch 'netflux' into beta 9 years ago
Yann Flory cc51e6d6ed Update CodeMirror pad to work with Netflux 9 years ago
ansuz a735d63306 migrate markdown rendering 'pad' to netflux 9 years ago
Yann Flory f5f8f6e1eb Remove the delay between a change and its propagation to chainpad 9 years ago
ansuz fa6914037c start rewriting codepad to use realtime-input 9 years ago
ansuz 2852c8f594 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta 9 years ago
Yann Flory fe3bb4da27 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux 9 years ago
Yann Flory 53b2644b64 Fix a issue with fights over usernames 9 years ago
Caleb James DeLisle 3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 9 years ago
ansuz 255dc17a5d Merge branch 'beta' into netflux 9 years ago
ansuz f9de1c9e1f Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 9 years ago
ansuz c14b86d84a add missing semicolon 9 years ago
ansuz b3ef2abb84 fix jshint complain 9 years ago
Yann Flory 85d5f5c47f Convert netflux to es5 9 years ago
Yann Flory c0b8aac792 Fix an issue where metadata could be duplicated in the realtime userdoc 9 years ago
ansuz 22cf18f78c Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta 9 years ago
ansuz c509c28c18 realtime form prototype, almost in good condition 9 years ago
ansuz 1a9e7299fc working state 9 years ago
ansuz 69e8f54e8f pass in Crypto to realtime-input 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 be1ef7abe3 migrate canvas to netflux 9 years ago
ansuz d4943511fe move text/ and hack/ to Netflux 9 years ago
ansuz 4c95602347 remove a little bit more dead code 9 years ago
ansuz b140b6429d remove a little bit of dead code 9 years ago
ansuz 2c6cf9883b stop using deleted file 9 years ago
ansuz bbdc9da853 delete duplicated file 9 years ago
ansuz cce50390a0 don't depend on library to set hash 9 years ago
ansuz 5f4825f3a0 don't change the hash from realtime input
let applications handle that logic
9 years ago
ansuz 80fb5e1e21 don't rely on RealtimeSocket exporting textPatcher 9 years ago
ansuz 4f426651ad remove TextPatcher from RealtimeTextSocket 9 years ago
ansuz a527024a8c start on realtime form prototype 9 years ago
ansuz 02ff1a63a4 Merge branch 'netflux' into beta
Conflicts:
	www/assert/main.js
9 years ago
ansuz 04f6299938 reconcile differences with netflux 9 years ago
ansuz 565fb1d186 include small snippets for preventing browser fights 9 years ago
ansuz ffbd428b87 better logging of browser fights 9 years ago
ansuz 4d44661f3b more correct tests 9 years ago
ansuz a18c793f98 use latest hyperjson 9 years ago
ansuz 980ff8a0ca Fix a test that was failing on chrome
it failed for reasons which are irrelevant to our application
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
ansuz 9498937b43 add a FIXME to the assert page
tests were failing (unnecessarily) on Chrome
9 years ago
ansuz a3787ee4dc Merge branch 'netflux' into beta 9 years ago
ansuz 06b464c524 move sheet/ to .git 9 years ago
ansuz cdf02ac725 remove input pad 9 years ago
ansuz 11961b4f1d export stringifyDOM to REALTIME_MODULE 9 years ago
ansuz 5db487db3f remove old pad entirely
hyperjson version is considered a strict improvement
9 years ago
ansuz 010566d3c3 pushDelta was mistakenly deprecated. restored. 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 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 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 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 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
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
ansuz f4c5b2a996 Add sane defaults to TextPatcher diffs 9 years ago
ansuz 259772dd62 Turn on TextPatcher logging for _socket 9 years ago
ansuz 0537c28919 Add switchable logging to TextPatcher.js 9 years ago
Caleb James DeLisle 8a36963582 Enable ChainPad PARANOIA mode but remove the part which causes most slowness 9 years ago
ansuz 284da6a4e9 minor improvements I made to the /hack/ pad last night 9 years ago
ansuz 9f0cc4ed64 update hack with a slightly better UI 9 years ago
ansuz 71c0a06c3b Merge branch 'hack' into diffdom 9 years ago
ansuz 19cd991dba trim dead code, comment, very minor optimizations 9 years ago
ansuz f75c246029 remove dead code from pad/main.js 9 years ago
ansuz 9f45ccb2d9 use console.error for stack traces 9 years ago
ansuz d705b947ab Merge branch 'diffdom' into netflux
basic cleanup while performing a larger merge between two prototypes
9 years ago
ansuz 2ffa69dc15 remove checks for a non-existent race condition 9 years ago
ansuz 368d72b337 add missing semicolons to TextPatcher.js 9 years ago
ansuz 851ccfbdb6 detect falsey operations in OT and ignore them 9 years ago
ansuz 400f6efde1 json-ot.js : jshint compliance 9 years ago
ansuz a0999d1d2b add a comment about why hashes are being stubbed 9 years ago
ansuz ca94d30386 detect falsey operations in OT and ignore them 9 years ago
ansuz 9f9cd8d8cd realtime-input.js : fixes for jshint compliance 9 years ago
ansuz 793149a608 json-ot.js : jshint compliance 9 years ago
ansuz 06a3b63923 jshint compliance for toolbar.js 9 years ago
ansuz 3b8238ef3b add missing semicolons to pad/main.js
jshint compliance
9 years ago
ansuz 5cead3fad3 add missing semicolons to TextPatcher.js 9 years ago
ansuz e6ab03164c import TypingTests.js and expose at the console
RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
9 years ago
ansuz 94e57e4a26 update location of text-patcher.js 9 years ago
ansuz b37dab1f49 Merge branch 'diffdom' into netflux
Simple cleanup and unit tests
9 years ago
ansuz a07774e81a Implement tests for serialization
ensure that complex DOM elements can serialize and deserialize without modifications

RTWYSIWYG-54
> implement tests for components of the WYSIWYG editor
9 years ago
ansuz 6bb37aed44 main.js : support tab insertion in /hack/ pad 9 years ago
ansuz 6b9d982d40 stabilize _socket/realtime-input.js
...as common/RealtimeTextSocket.js
9 years ago
ansuz 1a22592afa remove unused modules from realtime-input.js 9 years ago
ansuz 39071021eb stabilize typingTest.js as /common/TypingTests.js 9 years ago
ansuz 9805958ad7 stabilize text-patcher.js into /common/TextPatcher.js 9 years ago
ansuz 2c34833d2c break text-patcher's functionality into components
text-patcher.js now exports diff, patch, log, and apply change
in addition to the previous 'create' method.
9 years ago
ansuz 7782069dbd Merge pull request #15 from xwiki-labs/diffdom
merge diffdom into netflux
9 years ago
ansuz a1f9b10175 remove offending line from chainpad entirely
RTCHAINPAD-3
9 years ago
ansuz 4071a3aa25 revert to using the chainpad in /common/
now that we have found the problem that caused the backspace bug
we don't need a special chainpad for testing.
9 years ago
ansuz 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
ansuz 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