11787 Commits (a435b1c12d5c0bb6360e824107052a31af31ffb8)
 

Author SHA1 Message Date
ansuz 5cd118bdb0 ignore netflux since it's ecma6 and not our code 9 years ago
ansuz 3a7af63c54 correct malformed json 9 years ago
Yann Flory b7885eb539 Fix channel history 9 years ago
ansuz 136e2d8cf2 pass in missing textarea argument so textpad starts working again 9 years ago
ansuz 8258018c1d Revert "fix undefined reference"
This reverts commit 7d65540123.

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

This reverts commit 93fb944e1f.
9 years ago
Yann Flory c536ecbc1c Temp commit 9 years ago
Yann Flory 870b2dbb7e Add the WebRTC server in Cryptpad 9 years ago
Caleb James DeLisle 142d4fad60 Merge branch 'master' into netflux 9 years ago
Caleb James DeLisle 9f682a985b lvl should not fail on non-existant channels 9 years ago
Yann Flory c4f62fb812 First try with WebRTC 9 years ago
Yann Flory 09a06a8bc5 Replace the chainpad server by the netflux server 9 years ago
Yann Flory 60c3aceb0d Add chatflux server 9 years ago
Yann Flory deb2084fc5 Add the socket connection checker 9 years ago
ansuz d3e2a2f52e make verbose logging switchable via a conditional 9 years ago
ansuz 1c54af69a1 update minor editors to use new realtime-input api 9 years ago
ansuz 9b228eea6b modify vdom main.js to adhere to new realtime-input api 9 years ago
ansuz fefb904261 realtime input changes 9 years ago
ansuz fd99dba4a3 modify realtime-input api to take a single object as configuration. merge netflux API 9 years ago
Yann Flory 62ba579d4a Add Netflux API with WebSocket service V1 9 years ago
ansuz 53d3e475f7 ui hints for hackpad 9 years ago
ansuz d2f4fbcee9 fail the toolbar from the application layer 9 years ago
ansuz d7b34cf6be don't call toolbar from within realtime-input.js 9 years ago
ansuz e8469ae1bb test out extended realtime-input api 9 years ago
ansuz 3539c71c07 howto maintain your cryptpad instance 9 years ago
ansuz 0327fbc874 Merge branch 'master' of github.com:xwiki-labs/cryptpad
Conflicts:
	.travis.yml
9 years ago
ansuz 5e1566eaec fix incomplete 'onAbort' block 9 years ago
ansuz 52fe892bae invert logical relationship with flag
otherwise updates don't actually propogate
9 years ago
ansuz 938df2b92f lock the editor until the chain has synced
add 'onAbort' hook. lock the editor if the connection fails.
9 years ago
ansuz 1d6ccc99a1 add 'onAbort' hook to realtime-input.js 9 years ago
ansuz e5bef52850 reintroduce the toolbar 9 years ago
ansuz 6ff5b10486 remove local diffDOM version 9 years ago
ansuz 93fb944e1f remove broken functions from convert module 9 years ago
ansuz 7d65540123 fix undefined reference 9 years ago
ansuz c246adc57b Lock contenteditable until chain is done syncing.
Don't bother patching the dom until the chain has synced
9 years ago
ansuz 4067e1caa8 https is more reliable than git for bower, it seems 9 years ago
ansuz 1c0074258c go back to using diffDOM from bower
The latest version is required. You'll need to update.
9 years ago
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.
9 years ago
ansuz 46417441ae ignore local diffDOM.js until out PR gets merged 9 years ago
ansuz 79bd82a62e main.js : integrate with patched diffDOM 9 years ago
ansuz 6884fabda9 Use local diffDOM instead of bower_components
At least until the PR gets accepted
9 years ago
ansuz f5a8727254 remove some unused functions from cursor.js 9 years ago
ansuz db1515c445 cursor.js : commit before cleaning up 9 years ago
ansuz 7e367e770e resize vdom debug panel to 30% width 9 years ago
ansuz 91ada5ce7a export Operation from chainpad. for use with OT 9 years ago
ansuz 5425699f43 check if possible parent exists before checking if it contains another element 9 years ago
ansuz 67bdb8a65a fix a bad regex that occasionally threw an error
'nothing to repeat'
9 years ago
ansuz e87a4599a4 main.js : tiny patch until things are working correctly. 9 years ago
ansuz 9ce59c985f only do stuff with the cursor when a remote edit takes place 9 years ago
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
9 years ago