Yann Flory
|
6e50ae94dd
|
Remove unused code
|
2016-03-15 10:51:19 +01:00 |
|
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
|
2016-03-15 10:37:27 +01:00 |
|
Yann Flory
|
3a188625e0
|
Improve the detection of a disconnected peer to update the user list with the WebRTC service
|
2016-03-14 15:20:00 +01:00 |
|
Yann Flory
|
77e7fb5724
|
Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel
|
2016-03-14 14:49:19 +01:00 |
|
Yann Flory
|
06e5c84702
|
Clean some code
|
2016-03-11 17:32:45 +01:00 |
|
Yann Flory
|
29033f344c
|
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
|
2016-03-11 17:15:55 +01:00 |
|
Yann Flory
|
b1e8bcddef
|
Fix the user list not working with the WebRTC service and causing major issues
|
2016-03-11 17:09:27 +01:00 |
|
Yann Flory
|
c576241104
|
Add a Chainpad adapter to make Chainpad know the userList
|
2016-03-10 18:48:38 +01:00 |
|
ansuz
|
ffef837326
|
Merge branch 'diffdom'
|
2016-03-10 14:14:50 +01:00 |
|
ansuz
|
a9f088710c
|
also ignore webrtc server
|
2016-03-10 14:11:03 +01:00 |
|
ansuz
|
8e41f43802
|
ignore netflux socket server since it has ES6
|
2016-03-10 14:10:11 +01:00 |
|
ansuz
|
fb0e82931d
|
correct malformed json
|
2016-03-10 14:08:15 +01:00 |
|
ansuz
|
82b86879d2
|
ignore netflux since it's ecma6 and not our code
|
2016-03-10 14:07:13 +01:00 |
|
Yann Flory
|
996261f9db
|
Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux
|
2016-03-10 14:05:29 +01:00 |
|
Yann Flory
|
ae8f6f7f2c
|
Ability to choose which protocol to use (Websocket or WebRTC) with Netflux
|
2016-03-10 14:03:31 +01:00 |
|
ansuz
|
8efbc2611d
|
ignore netflux since it's ecma6 and not our code
|
2016-03-10 12:01:14 +01:00 |
|
ansuz
|
5cd118bdb0
|
ignore netflux since it's ecma6 and not our code
|
2016-03-10 12:00:36 +01:00 |
|
ansuz
|
3a7af63c54
|
correct malformed json
|
2016-03-10 11:58:23 +01:00 |
|
Yann Flory
|
b7885eb539
|
Fix channel history
|
2016-03-09 18:35:39 +01:00 |
|
ansuz
|
136e2d8cf2
|
pass in missing textarea argument so textpad starts working again
|
2016-03-09 11:02:12 +01:00 |
|
ansuz
|
8258018c1d
|
Revert "fix undefined reference"
This reverts commit 7d65540123.
To restore functionality in convert.js
|
2016-03-09 10:32:57 +01:00 |
|
ansuz
|
c67451bc1a
|
Revert "remove broken functions from convert module"
Because I forgot that the /render/ page was still using vdom
This reverts commit 93fb944e1f.
|
2016-03-09 10:29:51 +01:00 |
|
Yann Flory
|
c536ecbc1c
|
Temp commit
|
2016-03-08 15:13:57 +01:00 |
|
Yann Flory
|
870b2dbb7e
|
Add the WebRTC server in Cryptpad
|
2016-03-08 11:45:03 +01:00 |
|
Caleb James DeLisle
|
142d4fad60
|
Merge branch 'master' into netflux
|
2016-03-08 11:43:54 +01:00 |
|
Caleb James DeLisle
|
9f682a985b
|
lvl should not fail on non-existant channels
|
2016-03-08 11:43:25 +01:00 |
|
Yann Flory
|
c4f62fb812
|
First try with WebRTC
|
2016-03-08 11:25:37 +01:00 |
|
Yann Flory
|
09a06a8bc5
|
Replace the chainpad server by the netflux server
|
2016-03-07 17:35:31 +01:00 |
|
Yann Flory
|
60c3aceb0d
|
Add chatflux server
|
2016-03-07 17:18:47 +01:00 |
|
Yann Flory
|
deb2084fc5
|
Add the socket connection checker
|
2016-03-07 12:00:45 +01:00 |
|
ansuz
|
d3e2a2f52e
|
make verbose logging switchable via a conditional
|
2016-03-07 11:59:36 +01:00 |
|
ansuz
|
1c54af69a1
|
update minor editors to use new realtime-input api
|
2016-03-07 11:52:18 +01:00 |
|
ansuz
|
9b228eea6b
|
modify vdom main.js to adhere to new realtime-input api
|
2016-03-07 11:36:33 +01:00 |
|
ansuz
|
fefb904261
|
realtime input changes
|
2016-03-07 11:34:16 +01:00 |
|
ansuz
|
fd99dba4a3
|
modify realtime-input api to take a single object as configuration. merge netflux API
|
2016-03-07 11:33:46 +01:00 |
|
Yann Flory
|
62ba579d4a
|
Add Netflux API with WebSocket service V1
|
2016-03-07 11:07:37 +01:00 |
|
ansuz
|
53d3e475f7
|
ui hints for hackpad
|
2016-03-04 16:47:59 +01:00 |
|
ansuz
|
d2f4fbcee9
|
fail the toolbar from the application layer
|
2016-03-04 16:46:18 +01:00 |
|
ansuz
|
d7b34cf6be
|
don't call toolbar from within realtime-input.js
|
2016-03-04 16:45:11 +01:00 |
|
ansuz
|
e8469ae1bb
|
test out extended realtime-input api
|
2016-03-04 16:41:34 +01:00 |
|
ansuz
|
3539c71c07
|
howto maintain your cryptpad instance
|
2016-03-04 12:14:40 +01:00 |
|
ansuz
|
0327fbc874
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
Conflicts:
.travis.yml
|
2016-03-04 11:28:27 +01:00 |
|
ansuz
|
5e1566eaec
|
fix incomplete 'onAbort' block
|
2016-03-04 11:07:12 +01:00 |
|
ansuz
|
52fe892bae
|
invert logical relationship with flag
otherwise updates don't actually propogate
|
2016-03-04 11:05:58 +01:00 |
|
ansuz
|
938df2b92f
|
lock the editor until the chain has synced
add 'onAbort' hook. lock the editor if the connection fails.
|
2016-03-03 18:05:05 +01:00 |
|
ansuz
|
1d6ccc99a1
|
add 'onAbort' hook to realtime-input.js
|
2016-03-03 18:04:14 +01:00 |
|
ansuz
|
e5bef52850
|
reintroduce the toolbar
|
2016-03-03 16:05:07 +01:00 |
|
ansuz
|
6ff5b10486
|
remove local diffDOM version
|
2016-03-03 16:04:08 +01:00 |
|
ansuz
|
93fb944e1f
|
remove broken functions from convert module
|
2016-03-03 15:18:05 +01:00 |
|
ansuz
|
7d65540123
|
fix undefined reference
|
2016-03-03 15:12:43 +01:00 |