Commit Graph

  • 941f5361ea forgot to add 'typingTest', which main depends on ansuz 2016-03-29 11:16:50 +0200
  • d852c578d8 removed dead code ansuz 2016-03-29 11:16:13 +0200
  • 5591aae8fa Clean up main file ansuz 2016-03-29 11:12:46 +0200
  • 478ccbf984 revert changes to chainpad ansuz 2016-03-29 11:04:34 +0200
  • e3b78e20de Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax ansuz 2016-03-25 18:01:51 +0100
  • e26246178f start to clean up and give things more sensible names. ansuz 2016-03-25 18:01:23 +0100
  • b372b0b77c small change to chainpad in order to make it more likely to fail if the authDoc goes into the wrong state Caleb James DeLisle 2016-03-25 17:35:07 +0100
  • f3fb674504 Merge branch 'cjd-fixed-it-with-hax' of github.com:xwiki-labs/cryptpad into cjd-fixed-it-with-hax Caleb James DeLisle 2016-03-25 16:50:17 +0100
  • 98c85cef8b xxx Caleb James DeLisle 2016-03-25 16:49:27 +0100
  • 12dcbc9121 fix quick red fox and make test.cancel work again ansuz 2016-03-25 16:14:17 +0100
  • 62eabbc7ae If a message does not match parent hash, don't delete it from storage Caleb James DeLisle 2016-03-25 15:23:19 +0100
  • dbf31798d5 json-ot triggering PARANOIA errors in ChainPad Caleb James DeLisle 2016-03-25 15:01:17 +0100
  • 03932d0169 small changes to chainpad for testing Caleb James DeLisle 2016-03-25 14:52:44 +0100
  • 669bcc1935 If there is a difference in the hjson then send a message back Caleb James DeLisle 2016-03-25 14:26:31 +0100
  • f62ec85a4c Shuffled around some assertions and logs Caleb James DeLisle 2016-03-25 14:14:19 +0100
  • 420a7098a6 more testing and crap Caleb James DeLisle 2016-03-25 12:45:51 +0100
  • 4b35a145e3 Push WIP ansuz 2016-03-25 11:04:27 +0100
  • 42c972116b leave TODO re: diffDOM and magicline ansuz 2016-03-24 12:50:04 +0100
  • e066730b68 add notes about how hyperjson is to be used ansuz 2016-03-24 12:46:35 +0100
  • cd462ed872 Merge legacy websocket version ansuz 2016-03-24 12:28:45 +0100
  • c047d5310f implement optional filtering in hyperjson ansuz 2016-03-24 12:11:31 +0100
  • 0d33af773f implement optional filtering in hyperjson ansuz 2016-03-24 12:11:31 +0100
  • 475ca9bea8 hyperjson.js : used split instead of filter... oops ansuz 2016-03-23 12:31:16 +0100
  • 1bd5cb9e27 hyperjson.js : used split instead of filter... oops ansuz 2016-03-23 12:31:16 +0100
  • b2753ef7b7 fix string manipulation off-by-one ansuz 2016-03-22 19:28:50 +0100
  • f98fda7604 fix string manipulation off-by-one ansuz 2016-03-22 19:28:50 +0100
  • 4f3fcb08a4 better error reporting when the operational transform fails to parse JSON ansuz 2016-03-22 10:19:13 +0100
  • 0ff4906f0e implement better serialization of class names ansuz 2016-03-22 10:16:14 +0100
  • fbe6225681 Don't attempt to use the cursor selection when it has length 0 ansuz 2016-03-22 10:06:42 +0100
  • 0c6222b5f9 better error reporting when the operational transform fails to parse JSON ansuz 2016-03-22 10:19:13 +0100
  • 79a9998b13 implement better serialization of class names ansuz 2016-03-22 10:16:14 +0100
  • bd24821c6c Don't attempt to use the cursor selection when it has length 0 ansuz 2016-03-22 10:06:42 +0100
  • de6db0285c Limit the size of the usernames to 32 chars Yann Flory 2016-03-16 17:48:27 +0100
  • 38d797a4f1 Fix issue with Chrome and WebRTC Yann Flory 2016-03-16 17:38:26 +0100
  • 7237c751d5 Move 'vdom' to the main 'pad'. Yann Flory 2016-03-16 17:09:08 +0100
  • c7d190f1c0 Improve the server so that both protocol (WebSocket and WebRTC) can use the same port Yann Flory 2016-03-16 16:34:27 +0100
  • 7ee75b9e7f Messages received by the WebSocket server are now saved in a file Yann Flory 2016-03-16 14:57:13 +0100
  • e77d85bc82 Trigger an onReady() method when the user's pad is fully synced (the history is loaded) Yann Flory 2016-03-16 14:00:14 +0100
  • eca4ec699c Ability to change the username (the user ID is displayed by default) Yann Flory 2016-03-16 12:02:39 +0100
  • 6e50ae94dd Remove unused code Yann Flory 2016-03-15 10:51:19 +0100
  • 5da8560e22 Fix the user list in the toolbar keeping old data with the WebSocket server Yann Flory 2016-03-15 10:37:27 +0100
  • 3a188625e0 Improve the detection of a disconnected peer to update the user list with the WebRTC service Yann Flory 2016-03-14 15:20:00 +0100
  • 77e7fb5724 Fix an issue with the WebRTC service where it was impossible to join a channel once someone had left this channel Yann Flory 2016-03-14 14:49:19 +0100
  • 06e5c84702 Clean some code Yann Flory 2016-03-11 17:32:45 +0100
  • 29033f344c Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux Yann Flory 2016-03-11 17:15:55 +0100
  • b1e8bcddef Fix the user list not working with the WebRTC service and causing major issues Yann Flory 2016-03-11 17:09:27 +0100
  • c576241104 Add a Chainpad adapter to make Chainpad know the userList Yann Flory 2016-03-10 18:48:38 +0100
  • ffef837326 Merge branch 'diffdom' ansuz 2016-03-10 14:14:50 +0100
  • a9f088710c also ignore webrtc server ansuz 2016-03-10 14:11:03 +0100
  • 8e41f43802 ignore netflux socket server since it has ES6 ansuz 2016-03-10 14:10:11 +0100
  • fb0e82931d correct malformed json ansuz 2016-03-10 11:58:23 +0100
  • 82b86879d2 ignore netflux since it's ecma6 and not our code ansuz 2016-03-10 12:00:36 +0100
  • 996261f9db Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux Yann Flory 2016-03-10 14:05:29 +0100
  • ae8f6f7f2c Ability to choose which protocol to use (Websocket or WebRTC) with Netflux Yann Flory 2016-03-10 14:03:31 +0100
  • 8efbc2611d ignore netflux since it's ecma6 and not our code ansuz 2016-03-10 12:00:36 +0100
  • 5cd118bdb0 ignore netflux since it's ecma6 and not our code ansuz 2016-03-10 12:00:36 +0100
  • 3a7af63c54 correct malformed json ansuz 2016-03-10 11:58:23 +0100
  • b7885eb539 Fix channel history Yann Flory 2016-03-09 18:35:39 +0100
  • 136e2d8cf2 pass in missing textarea argument so textpad starts working again ansuz 2016-03-09 11:02:12 +0100
  • 8258018c1d Revert "fix undefined reference" ansuz 2016-03-09 10:32:57 +0100
  • c67451bc1a Revert "remove broken functions from convert module" ansuz 2016-03-09 10:29:51 +0100
  • c536ecbc1c Temp commit Yann Flory 2016-03-08 15:13:57 +0100
  • 870b2dbb7e Add the WebRTC server in Cryptpad Yann Flory 2016-03-08 11:45:03 +0100
  • 142d4fad60 Merge branch 'master' into netflux Caleb James DeLisle 2016-03-08 11:43:54 +0100
  • 9f682a985b lvl should not fail on non-existant channels Caleb James DeLisle 2016-03-08 11:43:25 +0100
  • c4f62fb812 First try with WebRTC Yann Flory 2016-03-08 11:25:37 +0100
  • 09a06a8bc5 Replace the chainpad server by the netflux server Yann Flory 2016-03-07 17:35:31 +0100
  • 60c3aceb0d Add chatflux server Yann Flory 2016-03-07 17:18:47 +0100
  • deb2084fc5 Add the socket connection checker Yann Flory 2016-03-07 12:00:45 +0100
  • d3e2a2f52e make verbose logging switchable via a conditional ansuz 2016-03-07 11:59:36 +0100
  • 1c54af69a1 update minor editors to use new realtime-input api ansuz 2016-03-07 11:52:18 +0100
  • 9b228eea6b modify vdom main.js to adhere to new realtime-input api ansuz 2016-03-07 11:36:33 +0100
  • fefb904261 realtime input changes ansuz 2016-03-07 11:34:16 +0100
  • fd99dba4a3 modify realtime-input api to take a single object as configuration. merge netflux API ansuz 2016-03-07 11:33:46 +0100
  • 62ba579d4a Add Netflux API with WebSocket service V1 Yann Flory 2016-03-07 11:06:06 +0100
  • 53d3e475f7 ui hints for hackpad ansuz 2016-03-04 16:47:59 +0100
  • d2f4fbcee9 fail the toolbar from the application layer ansuz 2016-03-04 16:46:18 +0100
  • d7b34cf6be don't call toolbar from within realtime-input.js ansuz 2016-03-04 16:45:11 +0100
  • e8469ae1bb test out extended realtime-input api ansuz 2016-03-04 16:41:34 +0100
  • 3539c71c07 howto maintain your cryptpad instance ansuz 2016-03-04 12:14:40 +0100
  • 0327fbc874 Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2016-03-04 11:28:27 +0100
  • 5e1566eaec fix incomplete 'onAbort' block ansuz 2016-03-04 11:07:12 +0100
  • 52fe892bae invert logical relationship with flag ansuz 2016-03-04 11:05:58 +0100
  • 938df2b92f lock the editor until the chain has synced ansuz 2016-03-03 18:05:05 +0100
  • 1d6ccc99a1 add 'onAbort' hook to realtime-input.js ansuz 2016-03-03 18:04:14 +0100
  • e5bef52850 reintroduce the toolbar ansuz 2016-03-03 16:05:07 +0100
  • 6ff5b10486 remove local diffDOM version ansuz 2016-03-03 16:04:08 +0100
  • 93fb944e1f remove broken functions from convert module ansuz 2016-03-03 15:18:05 +0100
  • 7d65540123 fix undefined reference ansuz 2016-03-03 15:12:43 +0100
  • c246adc57b Lock contenteditable until chain is done syncing. ansuz 2016-03-03 14:38:07 +0100
  • 4067e1caa8 https is more reliable than git for bower, it seems ansuz 2016-03-03 11:21:52 +0100
  • 1c0074258c go back to using diffDOM from bower ansuz 2016-03-03 10:49:59 +0100
  • 5d9ee650c5 Point bower.json to github for diffDOM ansuz 2016-03-03 10:42:28 +0100
  • 46417441ae ignore local diffDOM.js until out PR gets merged ansuz 2016-03-01 10:45:49 +0100
  • 79bd82a62e main.js : integrate with patched diffDOM ansuz 2016-02-29 17:59:00 +0100
  • 6884fabda9 Use local diffDOM instead of bower_components ansuz 2016-02-29 17:05:04 +0100
  • f5a8727254 remove some unused functions from cursor.js ansuz 2016-02-29 16:52:07 +0100
  • db1515c445 cursor.js : commit before cleaning up ansuz 2016-02-29 16:27:55 +0100
  • 7e367e770e resize vdom debug panel to 30% width ansuz 2016-02-29 15:37:51 +0100
  • 91ada5ce7a export Operation from chainpad. for use with OT ansuz 2016-02-29 15:28:32 +0100