Commit Graph

2734 Commits (dbfad9d2271d22d5ef7ecdba30b9bab5ea237605)
 

Author SHA1 Message Date
ansuz 136e2d8cf2 pass in missing textarea argument so textpad starts working again
ansuz 8258018c1d Revert "fix undefined reference"
This reverts commit 7d65540123.

To restore functionality in convert.js
ansuz c67451bc1a Revert "remove broken functions from convert module"
Because I forgot that the /render/ page was still using vdom

This reverts commit 93fb944e1f.
Yann Flory c536ecbc1c Temp commit
Yann Flory 870b2dbb7e Add the WebRTC server in Cryptpad
Caleb James DeLisle 142d4fad60 Merge branch 'master' into netflux
Caleb James DeLisle 9f682a985b lvl should not fail on non-existant channels
Yann Flory c4f62fb812 First try with WebRTC
Yann Flory 09a06a8bc5 Replace the chainpad server by the netflux server
Yann Flory 60c3aceb0d Add chatflux server
Yann Flory deb2084fc5 Add the socket connection checker
ansuz d3e2a2f52e make verbose logging switchable via a conditional
ansuz 1c54af69a1 update minor editors to use new realtime-input api
ansuz 9b228eea6b modify vdom main.js to adhere to new realtime-input api
ansuz fefb904261 realtime input changes
ansuz fd99dba4a3 modify realtime-input api to take a single object as configuration. merge netflux API
Yann Flory 62ba579d4a Add Netflux API with WebSocket service V1
ansuz 53d3e475f7 ui hints for hackpad
ansuz d2f4fbcee9 fail the toolbar from the application layer
ansuz d7b34cf6be don't call toolbar from within realtime-input.js
ansuz e8469ae1bb test out extended realtime-input api
ansuz 3539c71c07 howto maintain your cryptpad instance
ansuz 0327fbc874 Merge branch 'master' of github.com:xwiki-labs/cryptpad
Conflicts:
	.travis.yml
ansuz 5e1566eaec fix incomplete 'onAbort' block
ansuz 52fe892bae invert logical relationship with flag
otherwise updates don't actually propogate
ansuz 938df2b92f lock the editor until the chain has synced
add 'onAbort' hook. lock the editor if the connection fails.
ansuz 1d6ccc99a1 add 'onAbort' hook to realtime-input.js
ansuz e5bef52850 reintroduce the toolbar
ansuz 6ff5b10486 remove local diffDOM version
ansuz 93fb944e1f remove broken functions from convert module
ansuz 7d65540123 fix undefined reference
ansuz c246adc57b Lock contenteditable until chain is done syncing.
Don't bother patching the dom until the chain has synced
ansuz 4067e1caa8 https is more reliable than git for bower, it seems
ansuz 1c0074258c go back to using diffDOM from bower
The latest version is required. You'll need to update.
ansuz 5d9ee650c5 Point bower.json to github for diffDOM
since they haven't pushed to bower.io since merging my PR.

You'll need to update to get things to work.
ansuz 46417441ae ignore local diffDOM.js until out PR gets merged
ansuz 79bd82a62e main.js : integrate with patched diffDOM
ansuz 6884fabda9 Use local diffDOM instead of bower_components
At least until the PR gets accepted
ansuz f5a8727254 remove some unused functions from cursor.js
ansuz db1515c445 cursor.js : commit before cleaning up
ansuz 7e367e770e resize vdom debug panel to 30% width
ansuz 91ada5ce7a export Operation from chainpad. for use with OT
ansuz 5425699f43 check if possible parent exists before checking if it contains another element
ansuz 67bdb8a65a fix a bad regex that occasionally threw an error
'nothing to repeat'
ansuz e87a4599a4 main.js : tiny patch until things are working correctly.
ansuz 9ce59c985f only do stuff with the cursor when a remote edit takes place
ansuz 39f56d4fd1 throw error when checking for the index of a node that has no parent.
it probably isn't in the dom if this is the case.
Check if it's there before using this function
ansuz de46be85ba add better helpers for finding and resetting the cursor
ansuz 7e7f1fee76 include abstracted json-ot, add comments, start to use cursor stuff
ansuz c09036bd29 snapshot cursor.js, as some things are working quite well now