infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity
377 Commits
1 Branch
3 Tags
274 MiB
master
v4.14.0
v4.14.1
v5.0.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '2b9d9ada8b'
${ noResults }
Commit Graph

377 Commits (2b9d9ada8bf00ce1e0ab32c6df255f0cdf731334)
 

Author SHA1 Message Date
Caleb James DeLisle 669bcc1935 If there is a difference in the hjson then send a message back 9 years ago
Caleb James DeLisle f62ec85a4c Shuffled around some assertions and logs 9 years ago
Caleb James DeLisle 420a7098a6 more testing and crap 9 years ago
ansuz 4b35a145e3 Push WIP 9 years ago
ansuz 42c972116b leave TODO re: diffDOM and magicline 
Hyperjson guarantees that magicline elements are not sent across the wire.
DiffDOM must guarantee that magicline elements will not be removed on remote edits.
 9 years ago
ansuz e066730b68 add notes about how hyperjson is to be used 9 years ago
ansuz cd462ed872 Merge legacy websocket version 9 years ago
ansuz c047d5310f implement optional filtering in hyperjson 
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.

Conflicts:
	www/common/convert.js
 9 years ago
ansuz 0d33af773f implement optional filtering in hyperjson 
Implemented via callback, return falsey if you want to filter an element
and all of its children from the serialized result.
 9 years ago
ansuz 475ca9bea8 hyperjson.js : used split instead of filter... oops 9 years ago
ansuz 1bd5cb9e27 hyperjson.js : used split instead of filter... oops 9 years ago
ansuz b2753ef7b7 fix string manipulation off-by-one 9 years ago
ansuz f98fda7604 fix string manipulation off-by-one 9 years ago
ansuz 4f3fcb08a4 better error reporting when the operational transform fails to parse JSON 9 years ago
ansuz 0ff4906f0e implement better serialization of class names 
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
               selectors which hyperscript could not parse.
 9 years ago
ansuz fbe6225681 Don't attempt to use the cursor selection when it has length 0 
RTWYSIWYG-20
RTWYSIWYG-24
 9 years ago
ansuz 0c6222b5f9 better error reporting when the operational transform fails to parse JSON 9 years ago
ansuz 79a9998b13 implement better serialization of class names 
RTWYSIWYG-27 : poorly formed yet valid HTML caused hyperjson to produce element
               selectors which hyperscript could not parse.
 9 years ago
ansuz bd24821c6c Don't attempt to use the cursor selection when it has length 0 
RTWYSIWYG-20
RTWYSIWYG-24
 9 years ago
Yann Flory de6db0285c Limit the size of the usernames to 32 chars 9 years ago
Yann Flory 38d797a4f1 Fix issue with Chrome and WebRTC 9 years ago
Yann Flory 7237c751d5 Move 'vdom' to the main 'pad'. 
Hide the right-hand panel (can de bisplayed with a 'debug' button)
Hide the IDs of users if they don't change their name
 9 years ago
Yann Flory c7d190f1c0 Improve the server so that both protocol (WebSocket and WebRTC) can use the same port 9 years ago
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 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 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