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

Commit Graph

  • c67451bc1a Revert "remove broken functions from convert module" ansuz 2016-03-09 10:29:51 +01:00
  • c536ecbc1c Temp commit Yann Flory 2016-03-08 15:13:57 +01:00
  • 870b2dbb7e Add the WebRTC server in Cryptpad Yann Flory 2016-03-08 11:45:03 +01:00
  • 142d4fad60 Merge branch 'master' into netflux Caleb James DeLisle 2016-03-08 11:43:54 +01:00
  • 9f682a985b lvl should not fail on non-existant channels Caleb James DeLisle 2016-03-08 11:43:25 +01:00
  • c4f62fb812 First try with WebRTC Yann Flory 2016-03-08 11:25:37 +01:00
  • 09a06a8bc5 Replace the chainpad server by the netflux server Yann Flory 2016-03-07 17:35:31 +01:00
  • 60c3aceb0d Add chatflux server Yann Flory 2016-03-07 17:18:47 +01:00
  • deb2084fc5 Add the socket connection checker Yann Flory 2016-03-07 12:00:45 +01:00
  • d3e2a2f52e make verbose logging switchable via a conditional ansuz 2016-03-07 11:59:36 +01:00
  • 1c54af69a1 update minor editors to use new realtime-input api ansuz 2016-03-07 11:52:18 +01:00
  • 9b228eea6b modify vdom main.js to adhere to new realtime-input api ansuz 2016-03-07 11:36:33 +01:00
  • fefb904261 realtime input changes ansuz 2016-03-07 11:34:16 +01:00
  • fd99dba4a3 modify realtime-input api to take a single object as configuration. merge netflux API ansuz 2016-03-07 11:33:46 +01:00
  • 62ba579d4a Add Netflux API with WebSocket service V1 Yann Flory 2016-03-07 11:06:06 +01:00
  • 53d3e475f7 ui hints for hackpad ansuz 2016-03-04 16:47:59 +01:00
  • d2f4fbcee9 fail the toolbar from the application layer ansuz 2016-03-04 16:46:18 +01:00
  • d7b34cf6be don't call toolbar from within realtime-input.js ansuz 2016-03-04 16:45:11 +01:00
  • e8469ae1bb test out extended realtime-input api ansuz 2016-03-04 16:41:34 +01:00
  • 3539c71c07 howto maintain your cryptpad instance ansuz 2016-03-04 12:14:40 +01:00
  • 0327fbc874 Merge branch 'master' of github.com:xwiki-labs/cryptpad ansuz 2016-03-04 11:28:27 +01:00
  • 5e1566eaec fix incomplete 'onAbort' block ansuz 2016-03-04 11:07:12 +01:00
  • 52fe892bae invert logical relationship with flag ansuz 2016-03-04 11:05:58 +01:00
  • 938df2b92f lock the editor until the chain has synced ansuz 2016-03-03 18:05:05 +01:00
  • 1d6ccc99a1 add 'onAbort' hook to realtime-input.js ansuz 2016-03-03 18:04:14 +01:00
  • e5bef52850 reintroduce the toolbar ansuz 2016-03-03 16:05:07 +01:00
  • 6ff5b10486 remove local diffDOM version ansuz 2016-03-03 16:04:08 +01:00
  • 93fb944e1f remove broken functions from convert module ansuz 2016-03-03 15:18:05 +01:00
  • 7d65540123 fix undefined reference ansuz 2016-03-03 15:12:43 +01:00
  • c246adc57b Lock contenteditable until chain is done syncing. ansuz 2016-03-03 14:38:07 +01:00
  • 4067e1caa8 https is more reliable than git for bower, it seems ansuz 2016-03-03 11:21:52 +01:00
  • 1c0074258c go back to using diffDOM from bower ansuz 2016-03-03 10:49:59 +01:00
  • 5d9ee650c5 Point bower.json to github for diffDOM ansuz 2016-03-03 10:42:28 +01:00
  • 46417441ae ignore local diffDOM.js until out PR gets merged ansuz 2016-03-01 10:45:49 +01:00
  • 79bd82a62e main.js : integrate with patched diffDOM ansuz 2016-02-29 17:59:00 +01:00
  • 6884fabda9 Use local diffDOM instead of bower_components ansuz 2016-02-29 17:05:04 +01:00
  • f5a8727254 remove some unused functions from cursor.js ansuz 2016-02-29 16:52:07 +01:00
  • db1515c445 cursor.js : commit before cleaning up ansuz 2016-02-29 16:27:55 +01:00
  • 7e367e770e resize vdom debug panel to 30% width ansuz 2016-02-29 15:37:51 +01:00
  • 91ada5ce7a export Operation from chainpad. for use with OT ansuz 2016-02-29 15:28:32 +01:00
  • 5425699f43 check if possible parent exists before checking if it contains another element ansuz 2016-02-29 15:27:11 +01:00
  • 67bdb8a65a fix a bad regex that occasionally threw an error ansuz 2016-02-25 12:35:11 +01:00
  • e87a4599a4 main.js : tiny patch until things are working correctly. ansuz 2016-02-23 16:22:09 +01:00
  • 9ce59c985f only do stuff with the cursor when a remote edit takes place ansuz 2016-02-23 15:54:25 +01:00
  • 39f56d4fd1 throw error when checking for the index of a node that has no parent. ansuz 2016-02-23 15:53:58 +01:00
  • de46be85ba add better helpers for finding and resetting the cursor ansuz 2016-02-23 15:52:58 +01:00
  • 7e7f1fee76 include abstracted json-ot, add comments, start to use cursor stuff ansuz 2016-02-22 18:01:57 +01:00
  • c09036bd29 snapshot cursor.js, as some things are working quite well now ansuz 2016-02-22 18:00:46 +01:00
  • 5e500f337e ignore otaml.js for jshint ansuz 2016-02-22 17:56:41 +01:00
  • 4eee1f5210 add orderOfNodes function to tree library ansuz 2016-02-22 17:56:17 +01:00
  • 7689151fc0 pull json validation for OT into its own module for reuse ansuz 2016-02-22 17:54:59 +01:00
  • fbb9163e42 main.js : clean up and commit before making big-ish changes for cursor fixing ansuz 2016-02-19 14:12:22 +01:00
  • b4eeceb206 use updated rangy.js from bower ansuz 2016-02-19 14:08:41 +01:00
  • 2c8a2406c6 cursor.js : snapshot before code deletion ansuz 2016-02-19 14:07:43 +01:00
  • 1beb3f5355 snapshot of treesome.js before deletion ansuz 2016-02-19 14:07:16 +01:00
  • 8ead5ca129 realtime-input.js : add notes regarding integration of the netflux api ansuz 2016-02-16 15:14:38 +01:00
  • c89f97202e jshint ignore external code ansuz 2016-02-15 16:51:54 +01:00
  • 278c4ab32f even more jshint compliance ansuz 2016-02-15 16:47:53 +01:00
  • 3cb94b8d80 jshint compliance ansuz 2016-02-15 16:07:46 +01:00
  • d1885fbab6 better jshint compliance for common files ansuz 2016-02-15 15:42:08 +01:00
  • 539cc3a2fa remove unused files from common directory ansuz 2016-02-15 15:41:36 +01:00
  • 77d85a777e stricter jshint complaints ansuz 2016-02-15 11:50:12 +01:00
  • afa2811472 remove local version of marked.js, prefer bower version ansuz 2016-02-15 11:49:47 +01:00
  • 587f95b6d7 don't overflow ansuz 2016-02-14 12:01:05 +01:00
  • a01331cb9a hide styling textarea no matter what ansuz 2016-02-12 16:44:54 +01:00
  • bffd19d76f ignore customization directory ansuz 2016-02-12 16:26:44 +01:00
  • b8e4ad6568 note that kademlia lib should not be used ansuz 2016-02-12 16:22:38 +01:00
  • a600ece5c5 fix jshint complaints in common directory ansuz 2016-02-12 16:22:20 +01:00
  • 4a05a859e6 fix initialization routines ansuz 2016-02-12 16:21:52 +01:00
  • f1915d3b7c fix jshint complaints in pad directory ansuz 2016-02-12 16:21:17 +01:00
  • fe3917c0f1 fix jshint complaints in codemirror directory ansuz 2016-02-12 16:20:55 +01:00
  • 2c5a2b6023 remove unused code, add todos, fix minor errors ansuz 2016-02-12 12:03:15 +01:00
  • 8ba1f5dfc9 Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect ansuz 2016-02-12 11:46:40 +01:00
  • c5ab5dfe26 realtime style editor with lorum ipsum ansuz 2016-02-12 11:45:40 +01:00
  • 967d636df9 address more jshint complaints ansuz 2016-02-12 11:39:37 +01:00
  • f6c848385f hyperjson.js : jshint complains about var index in for loop ansuz 2016-02-12 11:21:33 +01:00
  • 0fbbb51f7f drop this useless line ansuz 2016-02-12 11:19:36 +01:00
  • d1dd497457 html-patcher.js : add missing semicolon ansuz 2016-02-12 11:17:10 +01:00
  • 62ea172ff4 errorbox.js : add missing semicolon so jshint doesn't complain ansuz 2016-02-12 11:15:59 +01:00
  • c87bb2ec2d Merge branch 'patch-1' of https://github.com/monperrus/cryptpad Caleb James DeLisle 2016-02-12 11:14:34 +01:00
  • 3b5c932252 jshint ignore eval line ansuz 2016-02-12 11:10:59 +01:00
  • babef5d6ac mv travis.yml ./.travis.yml Caleb James DeLisle 2016-02-12 10:46:52 +01:00
  • 591323a62e travis.yml Caleb James DeLisle 2016-02-12 10:46:10 +01:00
  • 71f13fc60c Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect ansuz 2016-02-12 10:44:03 +01:00
  • ff6e1e6fc0 Added travisci branch diffdom Caleb James DeLisle 2016-02-12 10:43:33 +01:00
  • 778ef85fee Added travis.yml Caleb James DeLisle 2016-02-12 10:38:47 +01:00
  • ad1c7edc31 Added travis.yml Caleb James DeLisle 2016-02-12 10:38:47 +01:00
  • d5125f875d Added jshint Caleb James DeLisle 2016-02-12 10:33:09 +01:00
  • 7f92abc7bf Merge branch 'diffdom' of github.com:xwiki-labs/cryptpad into demoEffect ansuz 2016-02-12 10:24:11 +01:00
  • 7553ccff68 Remove a log line which was leftover after debugging Caleb James DeLisle 2016-02-12 08:24:46 +01:00
  • 13360c335b I'm an idiot - killer off-by-one ate the storage Caleb James DeLisle 2016-02-11 16:55:26 +01:00
  • 943a291903 Do not blow up if the error is that a chain cannot be found Caleb James DeLisle 2016-02-11 16:42:21 +01:00
  • a7da21ccba Remove the cursor treatment Caleb James DeLisle 2016-02-11 16:22:59 +01:00
  • 86c4a69a97 Switch to patching with DiffDOM for testing :D Caleb James DeLisle 2016-02-11 16:10:44 +01:00
  • 653ba33b65 Merge branch 'vdom' of github.com:xwiki-labs/cryptpad into demoEffect ansuz 2016-02-11 13:15:57 +01:00
  • 2031191261 testing=false Caleb James DeLisle 2016-02-11 13:13:58 +01:00
  • 37db31b09e Attempt an operational transformation and if the result is not valid JSON then fail Caleb James DeLisle 2016-02-11 12:34:06 +01:00
  • e16299b5c4 Revert "restub OT until it's verified" Caleb James DeLisle 2016-02-11 12:33:12 +01:00
  • dff8143fad Fix the lvl storage Caleb James DeLisle 2016-02-11 12:28:05 +01:00
  • c22269e36e cursor.js : make the console a little less noisy ansuz 2016-02-11 10:02:47 +01:00