Commit Graph

  • 39fcd7dc4c more specific filtering for magicline plugin ansuz 2016-05-17 16:55:47 +02:00
  • bce89b325f Merge pull request #21 from xwiki-labs/remove-channels ansuz 2016-05-17 14:41:43 +02:00
  • 9c15a43268 add removeChannel documentation to storage/README ansuz 2016-05-14 13:50:25 +02:00
  • 62dba6de7b add specific complaints for removeChannel's non-existence ansuz 2016-05-14 13:27:15 +02:00
  • 2d3ed84f5d don't say you deleted database entries if you didn't ansuz 2016-05-14 13:14:55 +02:00
  • 1b2c129380 implement channel removal in amnesiadb ansuz 2016-05-14 13:05:21 +02:00
  • 3232671a6a implement optional channel removal hooks ansuz 2016-05-14 13:04:05 +02:00
  • d59824929d pass config object into NetfluxServer ansuz 2016-05-14 12:52:34 +02:00
  • 061cffe462 transform and pass through the existing store ansuz 2016-05-14 12:51:52 +02:00
  • a08efc568b update default config to contain logToStdout ansuz 2016-05-14 12:50:03 +02:00
  • fe261c34bb set log level via the config file, not via a constant ansuz 2016-05-14 12:47:59 +02:00
  • cae750cd75 update padrtc for to use bower libraries ansuz 2016-05-13 17:35:17 +02:00
  • ad3c53c344 use textpatcher from bower for all pads ansuz 2016-05-13 17:32:56 +02:00
  • 0cd4f85ff0 remove migration notes ansuz 2016-05-13 17:00:01 +02:00
  • a7cbd8c470 we're pushing json over the wire, so let's use json-ot.validate ansuz 2016-05-13 16:42:14 +02:00
  • 3ea270acb9 fix cursors in form prototype ansuz 2016-05-13 16:41:36 +02:00
  • d8a96b38cf use hyperjson 1.2.2 ansuz 2016-05-12 18:37:37 +02:00
  • d2c8fbf1f8 use hyperjson.amd.js, not hyperjson.js ansuz 2016-05-12 18:21:01 +02:00
  • f5266e2109 use latest release of hyperjson ansuz 2016-05-12 18:20:30 +02:00
  • 491c3644ec Merge branch 'production' ansuz 2016-05-12 15:03:54 +02:00
  • 2bab22cc1f remove note about jquery sheet ansuz 2016-05-12 14:59:45 +02:00
  • 31052e49b8 remove note about jquery sheet ansuz 2016-05-12 14:59:45 +02:00
  • 663c157e2a expose text patcher to the window via APP ansuz 2016-05-12 10:46:17 +02:00
  • 1769ca16dc add example for configuring the logLevel in /pad/ ansuz 2016-05-10 10:23:22 +02:00
  • 7faf57602b implement log level settings from application layer ansuz 2016-05-10 09:39:20 +02:00
  • 523aff3067 use upstream chainpad.js ansuz 2016-05-09 15:50:19 +02:00
  • dcd130cd9d use hyperjson from bower in padrtc ansuz 2016-05-09 15:27:37 +02:00
  • c752e4a6e5 remove sharejs ansuz 2016-05-09 14:20:11 +02:00
  • 6b2e986789 remove deprecated textsocket library ansuz 2016-05-09 11:57:40 +02:00
  • d2fa5e8f70 start using hyperjson from bower.io ansuz 2016-05-09 11:41:02 +02:00
  • 150ebaba7b add ability to force text diffing ansuz 2016-04-27 17:58:55 +02:00
  • aef6f3a85b lock codemirror editor until chain has synced ansuz 2016-04-27 16:21:10 +02:00
  • 6736335db2 add 'made with <3' toolbar to code ansuz 2016-04-27 15:43:31 +02:00
  • 506a703b7d turn off TextPatcher logging on /pad/ ansuz 2016-04-27 15:40:48 +02:00
  • ba17b78f7a restyle name change button ansuz 2016-04-27 15:32:58 +02:00
  • d79b3616c9 remove unused files ansuz 2016-04-27 15:32:15 +02:00
  • 4c84758265 disable textpatcher logging ansuz 2016-04-27 15:30:53 +02:00
  • a5ae027043 make logging configurable ansuz 2016-04-27 15:03:41 +02:00
  • b09b73fcc6 remove chainpad server ansuz 2016-04-27 14:09:01 +02:00
  • 46b009d20f remove last non-netflux pad ansuz 2016-04-27 12:30:43 +02:00
  • 18e0131d6e Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta ansuz 2016-04-27 12:28:24 +02:00
  • 32d1807350 import unused functions from /p/, to be integrated later ansuz 2016-04-27 12:25:19 +02:00
  • 619406f868 Send an ACK when someone asks for the history Yann Flory 2016-04-27 12:17:39 +02:00
  • 492054a938 Fix the cursor position when a remote patch is applied Yann Flory 2016-04-27 12:17:06 +02:00
  • 626ecaffcd log browser fights in /pad/ ansuz 2016-04-27 11:10:31 +02:00
  • 5bb2e12db2 Merge branch 'beta' into migrate Yann Flory 2016-04-27 10:51:51 +02:00
  • afe78dad56 Merge branch 'netflux' into beta ansuz 2016-04-27 10:44:32 +02:00
  • cc51e6d6ed Update CodeMirror pad to work with Netflux Yann Flory 2016-04-27 10:44:04 +02:00
  • a735d63306 migrate markdown rendering 'pad' to netflux ansuz 2016-04-27 10:38:44 +02:00
  • f5f8f6e1eb Remove the delay between a change and its propagation to chainpad Yann Flory 2016-04-26 17:50:54 +02:00
  • fa6914037c start rewriting codepad to use realtime-input ansuz 2016-04-26 17:34:57 +02:00
  • 2852c8f594 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta ansuz 2016-04-26 17:24:51 +02:00
  • fe3bb4da27 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux Yann Flory 2016-04-26 17:18:31 +02:00
  • 53b2644b64 Fix a issue with fights over usernames Yann Flory 2016-04-26 17:16:58 +02:00
  • 3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta Caleb James DeLisle 2016-04-26 14:31:57 +02:00
  • 255dc17a5d Merge branch 'beta' into netflux ansuz 2016-04-25 16:08:00 +02:00
  • f9de1c9e1f Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta ansuz 2016-04-25 16:07:24 +02:00
  • c14b86d84a add missing semicolon ansuz 2016-04-25 16:07:02 +02:00
  • b3ef2abb84 fix jshint complain ansuz 2016-04-25 16:06:10 +02:00
  • 85d5f5c47f Convert netflux to es5 Yann Flory 2016-04-25 15:29:39 +02:00
  • c0b8aac792 Fix an issue where metadata could be duplicated in the realtime userdoc Yann Flory 2016-04-25 15:29:09 +02:00
  • 22cf18f78c Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta ansuz 2016-04-23 16:31:35 +02:00
  • c509c28c18 realtime form prototype, almost in good condition ansuz 2016-04-23 16:31:07 +02:00
  • 1a9e7299fc working state ansuz 2016-04-23 00:15:39 +02:00
  • 69e8f54e8f pass in Crypto to realtime-input ansuz 2016-04-22 18:54:24 +02:00
  • 5f16ad4a58 Update to most recent chainpad Caleb James DeLisle 2016-04-22 18:17:00 +02:00
  • aa07dd31ee have json-ot initialize its own debug module, instead of relying on a window variable's existence ansuz 2016-04-22 17:35:07 +02:00
  • d3203d1c2a Remove Crypto from the modules loaded with RequireJS in realtime-input Yann Flory 2016-04-22 14:26:37 +02:00
  • 8ac69ca262 Add a missing "time" property in the netflux client causing incorrect timeout errors Yann Flory 2016-04-22 11:46:27 +02:00
  • 2c158558f5 use leveldb adaptor by default ansuz 2016-04-22 11:05:54 +02:00
  • 60eb8b52a9 listen for websockets on the same port as the httpd ansuz 2016-04-22 10:55:20 +02:00
  • e83e5026ce make amnesiadb compatible with netflux ansuz 2016-04-22 10:54:44 +02:00
  • be1ef7abe3 migrate canvas to netflux ansuz 2016-04-22 10:04:54 +02:00
  • d4943511fe move text/ and hack/ to Netflux ansuz 2016-04-22 09:47:26 +02:00
  • 4c95602347 remove a little bit more dead code ansuz 2016-04-22 09:46:41 +02:00
  • b140b6429d remove a little bit of dead code ansuz 2016-04-22 09:46:06 +02:00
  • 2c6cf9883b stop using deleted file ansuz 2016-04-22 08:19:58 +02:00
  • bbdc9da853 delete duplicated file ansuz 2016-04-22 08:19:28 +02:00
  • cce50390a0 don't depend on library to set hash ansuz 2016-04-21 19:04:15 +02:00
  • 5f4825f3a0 don't change the hash from realtime input ansuz 2016-04-21 19:03:50 +02:00
  • d576fdc886 fix bug where empty channels failed ansuz 2016-04-21 19:03:22 +02:00
  • 80fb5e1e21 don't rely on RealtimeSocket exporting textPatcher ansuz 2016-04-21 17:59:30 +02:00
  • 4f426651ad remove TextPatcher from RealtimeTextSocket ansuz 2016-04-21 17:41:50 +02:00
  • 86bbc15017 document modified storage API ansuz 2016-04-21 17:14:59 +02:00
  • 7a02d85ec5 Netflux server mustn't send a zero message until the history is synced ansuz 2016-04-21 17:02:54 +02:00
  • ce69062b7c implement callback for getMessages ansuz 2016-04-21 17:01:21 +02:00
  • a527024a8c start on realtime form prototype ansuz 2016-04-21 15:51:04 +02:00
  • 02ff1a63a4 Merge branch 'netflux' into beta ansuz 2016-04-21 15:47:07 +02:00
  • 04f6299938 reconcile differences with netflux ansuz 2016-04-21 15:44:56 +02:00
  • 565fb1d186 include small snippets for preventing browser fights ansuz 2016-04-21 15:40:29 +02:00
  • ffbd428b87 better logging of browser fights ansuz 2016-04-21 15:06:03 +02:00
  • 4d44661f3b more correct tests ansuz 2016-04-21 15:05:41 +02:00
  • a18c793f98 use latest hyperjson ansuz 2016-04-21 14:53:53 +02:00
  • 980ff8a0ca Fix a test that was failing on chrome ansuz 2016-04-21 12:16:48 +02:00
  • 9efcc443cd add 'format' to TextPatcher's API ansuz 2016-04-21 12:16:11 +02:00
  • 2cab588d06 Remove the request to SauceLab's broken rest API which seems to explode when you hit it while a job is ongoing Caleb James DeLisle 2016-04-20 20:37:48 +02:00
  • e8eb677b0b debugging on the CI Caleb James DeLisle 2016-04-20 20:25:30 +02:00
  • eadca92e98 don't repeat travis calling npm install but do use https for https urls Caleb James DeLisle 2016-04-20 20:20:29 +02:00
  • 2d7309b04f minor refactoring and hopefully we will be able to get the actual links to the tests on SauceLabs Caleb James DeLisle 2016-04-20 20:16:51 +02:00
  • 8709311a7e Lets try running with multiple types of browsers Caleb James DeLisle 2016-04-20 19:18:31 +02:00