2556 Commits (192a517e64fc8a0992e4f52f1c11d3a5f2b5ebe5)
 

Author SHA1 Message Date
Yann Flory 7ee75b9e7f Messages received by the WebSocket server are now saved in a file 9 years ago
Yann Flory e77d85bc82 Trigger an onReady() method when the user's pad is fully synced (the history is loaded) 9 years ago
Yann Flory eca4ec699c Ability to change the username (the user ID is displayed by default) 9 years ago
Yann Flory 6e50ae94dd Remove unused code 9 years ago
Yann Flory 5da8560e22 Fix the user list in the toolbar keeping old data with the WebSocket server
Chainpad is no longer responsible for the userlist or the ping
9 years ago
Yann Flory 3a188625e0 Improve the detection of a disconnected peer to update the user list with the WebRTC service 9 years ago
Yann Flory 77e7fb5724 Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel 9 years ago
Yann Flory 06e5c84702 Clean some code 9 years ago
Yann Flory 29033f344c Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux 9 years ago
Yann Flory b1e8bcddef Fix the user list not working with the WebRTC service and causing major issues 9 years ago
Yann Flory c576241104 Add a Chainpad adapter to make Chainpad know the userList 9 years ago
ansuz ffef837326 Merge branch 'diffdom' 9 years ago
ansuz a9f088710c also ignore webrtc server 9 years ago
ansuz 8e41f43802 ignore netflux socket server since it has ES6 9 years ago
ansuz fb0e82931d correct malformed json 9 years ago
ansuz 82b86879d2 ignore netflux since it's ecma6 and not our code 9 years ago
Yann Flory 996261f9db Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux 9 years ago
Yann Flory ae8f6f7f2c Ability to choose which protocol to use (Websocket or WebRTC) with Netflux 9 years ago
ansuz 8efbc2611d ignore netflux since it's ecma6 and not our code 9 years ago
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