Commit Graph

11994 Commits (0929b5db472f5db99ab2ca6e246792c674fd106e)
 

Author SHA1 Message Date
ansuz b09b73fcc6 remove chainpad server
ansuz 46b009d20f remove last non-netflux pad
ansuz 18e0131d6e Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta
ansuz 32d1807350 import unused functions from /p/, to be integrated later
Yann Flory 619406f868 Send an ACK when someone asks for the history
Yann Flory 492054a938 Fix the cursor position when a remote patch is applied
ansuz 626ecaffcd log browser fights in /pad/
Yann Flory 5bb2e12db2 Merge branch 'beta' into migrate
ansuz afe78dad56 Merge branch 'netflux' into beta
Yann Flory cc51e6d6ed Update CodeMirror pad to work with Netflux
ansuz a735d63306 migrate markdown rendering 'pad' to netflux
Yann Flory f5f8f6e1eb Remove the delay between a change and its propagation to chainpad
ansuz fa6914037c start rewriting codepad to use realtime-input
ansuz 2852c8f594 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta
Yann Flory fe3bb4da27 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
Yann Flory 53b2644b64 Fix a issue with fights over usernames
Caleb James DeLisle 3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
ansuz 255dc17a5d Merge branch 'beta' into netflux
ansuz f9de1c9e1f Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
ansuz c14b86d84a add missing semicolon
ansuz b3ef2abb84 fix jshint complain
Yann Flory 85d5f5c47f Convert netflux to es5
Yann Flory c0b8aac792 Fix an issue where metadata could be duplicated in the realtime userdoc
ansuz 22cf18f78c Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta
ansuz c509c28c18 realtime form prototype, almost in good condition
ansuz 1a9e7299fc working state
ansuz 69e8f54e8f pass in Crypto to realtime-input
Caleb James DeLisle 5f16ad4a58 Update to most recent chainpad
ansuz aa07dd31ee have json-ot initialize its own debug module, instead of relying on a window variable's existence
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
Yann Flory 8ac69ca262 Add a missing "time" property in the netflux client causing incorrect
timeout errors
ansuz 2c158558f5 use leveldb adaptor by default
ansuz 60eb8b52a9 listen for websockets on the same port as the httpd
ansuz e83e5026ce make amnesiadb compatible with netflux
ansuz be1ef7abe3 migrate canvas to netflux
ansuz d4943511fe move text/ and hack/ to Netflux
ansuz 4c95602347 remove a little bit more dead code
ansuz b140b6429d remove a little bit of dead code
ansuz 2c6cf9883b stop using deleted file
ansuz bbdc9da853 delete duplicated file
ansuz cce50390a0 don't depend on library to set hash
ansuz 5f4825f3a0 don't change the hash from realtime input
let applications handle that logic
ansuz d576fdc886 fix bug where empty channels failed
ansuz 80fb5e1e21 don't rely on RealtimeSocket exporting textPatcher
ansuz 4f426651ad remove TextPatcher from RealtimeTextSocket
ansuz 86bbc15017 document modified storage API
ansuz 7a02d85ec5 Netflux server mustn't send a zero message until the history is synced
ansuz ce69062b7c implement callback for getMessages
ansuz a527024a8c start on realtime form prototype
ansuz 02ff1a63a4 Merge branch 'netflux' into beta
Conflicts:
	www/assert/main.js