web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 2c34833d2c break text-patcher's functionality into components ansuz 2016-04-12 12:27:33 +02:00
  • 7782069dbd Merge pull request #15 from xwiki-labs/diffdom ansuz 2016-04-12 10:21:19 +02:00
  • a1f9b10175 remove offending line from chainpad entirely ansuz 2016-04-12 10:02:11 +02:00
  • 4071a3aa25 revert to using the chainpad in /common/ ansuz 2016-04-12 09:55:50 +02:00
  • 4ba68eb2bf fix leaky variable in chainpad ansuz 2016-04-12 09:52:36 +02:00
  • 05108efdfa correct chainpad's transformation function ansuz 2016-04-12 09:44:08 +02:00
  • 360fee9feb Fix a new cursor error with Codepad Yann Flory 2016-04-11 17:58:30 +02:00
  • c2e0dded3a Fix an issue with the cursor sometimes disappearing when a patch was received Yann Flory 2016-04-11 15:47:40 +02:00
  • 713c90242b Hide the usernames when they have not been changed Yann Flory 2016-04-11 15:00:22 +02:00
  • 9330b00f02 Hide the spreadsheet button until it is fixed Yann Flory 2016-04-11 14:54:49 +02:00
  • c53baab99d Update Codepad with the latest improvements Yann Flory 2016-04-11 14:43:39 +02:00
  • 692fe24b32 Ability to use the old Chainpad server in parallel of the netflux server Yann Flory 2016-04-11 14:27:58 +02:00
  • 0b3d6e15b8 Replace the Netflux old client (netflux.js) by the Netflux2 client. Yann Flory 2016-04-07 18:48:01 +02:00
  • cd357a9136 turn an alert into a console.error ansuz 2016-04-07 17:03:30 +02:00
  • ec64e0d381 use getAttribute to inspect document elements ansuz 2016-04-07 15:55:57 +02:00
  • f5b0e1a5df Add comments, debug variables. initialize better ansuz 2016-04-07 15:50:56 +02:00
  • 842b9d4243 Generalize _socket/realtime-input.js a little more ansuz 2016-04-07 15:48:38 +02:00
  • cf9f60bd57 The server don't send back anymore messages to their sender Yann Flory 2016-04-07 11:27:14 +02:00
  • eb4ea7a6b0 Remove the content from the ACK messages sent by the server Yann Flory 2016-04-05 15:06:38 +02:00
  • ba4faea939 Update the pads to run with the latest improvements to the websocket server Yann Flory 2016-04-05 12:17:43 +02:00
  • 5ef7e29a9b Add the latest changes from _socket into the netflux pad Yann Flory 2016-04-01 17:58:33 +02:00
  • b59a14c5ac merge hyperjson changes from realtime xwiki ansuz 2016-04-01 11:20:19 +02:00
  • 2691d85582 use forked chainpad with assertions for _socket ansuz 2016-04-01 10:51:47 +02:00
  • b41f0e8c50 Merge branch 'cjd-fixed-it-with-hax' into netflux2 Yann Flory 2016-04-01 10:51:27 +02:00
  • c50690349b comments describing the role of each argument ansuz 2016-04-01 10:46:54 +02:00
  • df78d284c4 initial state should be valid JSON so JSON parse doesn't fail ansuz 2016-04-01 10:44:23 +02:00
  • 96e03fcfa4 Use latest chainpad without mutations ansuz 2016-03-30 15:29:28 +02:00
  • d5772c6315 when json-ot produces json that fails to parse... ansuz 2016-03-30 14:39:41 +02:00
  • aaf7c777cc add debugging info to the textPatcher ansuz 2016-03-30 14:38:10 +02:00
  • 523df40d09 Debugging concurrent typing: ansuz 2016-03-30 14:36:11 +02:00
  • e446a3645c don't send funny BR attributes over the wire. Properly initialize the typing test ansuz 2016-03-29 17:21:02 +02:00
  • 22290590cb don't rely on window scope in typingTest.js ansuz 2016-03-29 17:02:56 +02:00
  • 772ca5d30e comment out debugging line ansuz 2016-03-29 17:01:57 +02:00
  • 6c340a6527 chainpad testing = true, reject non-compliant messages ansuz 2016-03-29 16:53:40 +02:00
  • afa1104d85 Pull the cursor out of bogus BR tarpits when it gets stuck ansuz 2016-03-29 15:36:03 +02:00
  • bac0e0ff88 implement hyperjson filtering ansuz 2016-03-29 15:35:40 +02:00
  • e51635c4bb fix index error ansuz 2016-03-29 15:34:58 +02:00
  • 3aebf7d2c2 minor changes to pass linting ansuz 2016-03-29 12:35:23 +02:00
  • 29e24f556c kill another window variable ansuz 2016-03-29 12:13:57 +02:00
  • e699073d45 attempt to preserve the magic line plugin while someone else is typing ansuz 2016-03-29 11:54:55 +02:00
  • 941f5361ea forgot to add 'typingTest', which main depends on ansuz 2016-03-29 11:16:50 +02:00
  • d852c578d8 removed dead code ansuz 2016-03-29 11:16:13 +02:00
  • 5591aae8fa Clean up main file ansuz 2016-03-29 11:12:46 +02:00
  • 478ccbf984 revert changes to chainpad ansuz 2016-03-29 11:04:34 +02:00
  • 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 +01:00
  • e26246178f start to clean up and give things more sensible names. ansuz 2016-03-25 18:01:23 +01:00
  • 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 +01:00
  • 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 +01:00
  • 98c85cef8b xxx Caleb James DeLisle 2016-03-25 16:49:27 +01:00
  • 12dcbc9121 fix quick red fox and make test.cancel work again ansuz 2016-03-25 16:14:17 +01:00
  • 62eabbc7ae If a message does not match parent hash, don't delete it from storage Caleb James DeLisle 2016-03-25 15:23:19 +01:00
  • dbf31798d5 json-ot triggering PARANOIA errors in ChainPad Caleb James DeLisle 2016-03-25 15:01:17 +01:00
  • 03932d0169 small changes to chainpad for testing Caleb James DeLisle 2016-03-25 14:52:44 +01:00
  • 669bcc1935 If there is a difference in the hjson then send a message back Caleb James DeLisle 2016-03-25 14:26:31 +01:00
  • f62ec85a4c Shuffled around some assertions and logs Caleb James DeLisle 2016-03-25 14:14:19 +01:00
  • 420a7098a6 more testing and crap Caleb James DeLisle 2016-03-25 12:45:51 +01:00
  • 4b35a145e3 Push WIP ansuz 2016-03-25 11:04:27 +01:00
  • 42c972116b leave TODO re: diffDOM and magicline ansuz 2016-03-24 12:50:04 +01:00
  • e066730b68 add notes about how hyperjson is to be used ansuz 2016-03-24 12:46:35 +01:00
  • cd462ed872 Merge legacy websocket version ansuz 2016-03-24 12:28:45 +01:00
  • c047d5310f implement optional filtering in hyperjson ansuz 2016-03-24 12:11:31 +01:00
  • 0d33af773f implement optional filtering in hyperjson ansuz 2016-03-24 12:11:31 +01:00
  • 475ca9bea8 hyperjson.js : used split instead of filter... oops ansuz 2016-03-23 12:31:16 +01:00
  • 1bd5cb9e27 hyperjson.js : used split instead of filter... oops ansuz 2016-03-23 12:31:16 +01:00
  • b2753ef7b7 fix string manipulation off-by-one ansuz 2016-03-22 19:28:50 +01:00
  • f98fda7604 fix string manipulation off-by-one ansuz 2016-03-22 19:28:50 +01:00
  • 4f3fcb08a4 better error reporting when the operational transform fails to parse JSON ansuz 2016-03-22 10:19:13 +01:00
  • 0ff4906f0e implement better serialization of class names ansuz 2016-03-22 10:16:14 +01:00
  • fbe6225681 Don't attempt to use the cursor selection when it has length 0 ansuz 2016-03-22 10:06:42 +01:00
  • 0c6222b5f9 better error reporting when the operational transform fails to parse JSON ansuz 2016-03-22 10:19:13 +01:00
  • 79a9998b13 implement better serialization of class names ansuz 2016-03-22 10:16:14 +01:00
  • bd24821c6c Don't attempt to use the cursor selection when it has length 0 ansuz 2016-03-22 10:06:42 +01:00
  • de6db0285c Limit the size of the usernames to 32 chars Yann Flory 2016-03-16 17:48:27 +01:00
  • 38d797a4f1 Fix issue with Chrome and WebRTC Yann Flory 2016-03-16 17:38:26 +01:00
  • 7237c751d5 Move 'vdom' to the main 'pad'. Yann Flory 2016-03-16 17:09:08 +01:00
  • c7d190f1c0 Improve the server so that both protocol (WebSocket and WebRTC) can use the same port Yann Flory 2016-03-16 16:34:27 +01:00
  • 7ee75b9e7f Messages received by the WebSocket server are now saved in a file Yann Flory 2016-03-16 14:57:13 +01:00
  • 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 +01:00
  • eca4ec699c Ability to change the username (the user ID is displayed by default) Yann Flory 2016-03-16 12:02:39 +01:00
  • 6e50ae94dd Remove unused code Yann Flory 2016-03-15 10:51:19 +01:00
  • 5da8560e22 Fix the user list in the toolbar keeping old data with the WebSocket server Yann Flory 2016-03-15 10:37:27 +01:00
  • 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 +01:00
  • 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 +01:00
  • 06e5c84702 Clean some code Yann Flory 2016-03-11 17:32:45 +01:00
  • 29033f344c Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux Yann Flory 2016-03-11 17:15:55 +01:00
  • b1e8bcddef Fix the user list not working with the WebRTC service and causing major issues Yann Flory 2016-03-11 17:09:27 +01:00
  • c576241104 Add a Chainpad adapter to make Chainpad know the userList Yann Flory 2016-03-10 18:48:38 +01:00
  • ffef837326 Merge branch 'diffdom' ansuz 2016-03-10 14:14:50 +01:00
  • a9f088710c also ignore webrtc server ansuz 2016-03-10 14:11:03 +01:00
  • 8e41f43802 ignore netflux socket server since it has ES6 ansuz 2016-03-10 14:10:11 +01:00
  • fb0e82931d correct malformed json ansuz 2016-03-10 11:58:23 +01:00
  • 82b86879d2 ignore netflux since it's ecma6 and not our code ansuz 2016-03-10 12:00:36 +01:00
  • 996261f9db Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux Yann Flory 2016-03-10 14:05:29 +01:00
  • ae8f6f7f2c Ability to choose which protocol to use (Websocket or WebRTC) with Netflux Yann Flory 2016-03-10 14:03:31 +01:00
  • 8efbc2611d ignore netflux since it's ecma6 and not our code ansuz 2016-03-10 12:00:36 +01:00
  • 5cd118bdb0 ignore netflux since it's ecma6 and not our code ansuz 2016-03-10 12:00:36 +01:00
  • 3a7af63c54 correct malformed json ansuz 2016-03-10 11:58:23 +01:00
  • b7885eb539 Fix channel history Yann Flory 2016-03-09 18:35:39 +01:00
  • 136e2d8cf2 pass in missing textarea argument so textpad starts working again ansuz 2016-03-09 11:02:12 +01:00
  • 8258018c1d Revert "fix undefined reference" ansuz 2016-03-09 10:32:57 +01:00