Commit Graph

  • 18e0131d6e Merge branch 'migrate' of github.com:xwiki-labs/cryptpad into beta ansuz 2016-04-27 12:28:24 +0200
  • 32d1807350 import unused functions from /p/, to be integrated later ansuz 2016-04-27 12:25:19 +0200
  • 619406f868 Send an ACK when someone asks for the history Yann Flory 2016-04-27 12:17:39 +0200
  • 492054a938 Fix the cursor position when a remote patch is applied Yann Flory 2016-04-27 12:17:06 +0200
  • 626ecaffcd log browser fights in /pad/ ansuz 2016-04-27 11:10:31 +0200
  • 5bb2e12db2 Merge branch 'beta' into migrate Yann Flory 2016-04-27 10:51:51 +0200
  • afe78dad56 Merge branch 'netflux' into beta ansuz 2016-04-27 10:44:32 +0200
  • cc51e6d6ed Update CodeMirror pad to work with Netflux Yann Flory 2016-04-27 10:44:04 +0200
  • a735d63306 migrate markdown rendering 'pad' to netflux ansuz 2016-04-27 10:38:44 +0200
  • f5f8f6e1eb Remove the delay between a change and its propagation to chainpad Yann Flory 2016-04-26 17:50:54 +0200
  • fa6914037c start rewriting codepad to use realtime-input ansuz 2016-04-26 17:34:57 +0200
  • 2852c8f594 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into beta ansuz 2016-04-26 17:24:51 +0200
  • fe3bb4da27 Merge branch 'netflux' of github.com:xwiki-labs/cryptpad into netflux Yann Flory 2016-04-26 17:18:31 +0200
  • 53b2644b64 Fix a issue with fights over usernames Yann Flory 2016-04-26 17:16:58 +0200
  • 3b6fe44378 Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta Caleb James DeLisle 2016-04-26 14:31:57 +0200
  • 255dc17a5d Merge branch 'beta' into netflux ansuz 2016-04-25 16:08:00 +0200
  • f9de1c9e1f Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta ansuz 2016-04-25 16:07:24 +0200
  • c14b86d84a add missing semicolon ansuz 2016-04-25 16:07:02 +0200
  • b3ef2abb84 fix jshint complain ansuz 2016-04-25 16:06:10 +0200
  • 85d5f5c47f Convert netflux to es5 Yann Flory 2016-04-25 15:29:39 +0200
  • c0b8aac792 Fix an issue where metadata could be duplicated in the realtime userdoc Yann Flory 2016-04-25 15:29:09 +0200
  • 22cf18f78c Merge branch 'beta' of github.com:xwiki-labs/cryptpad into beta ansuz 2016-04-23 16:31:35 +0200
  • c509c28c18 realtime form prototype, almost in good condition ansuz 2016-04-23 16:31:07 +0200
  • 1a9e7299fc working state ansuz 2016-04-23 00:15:39 +0200
  • 69e8f54e8f pass in Crypto to realtime-input ansuz 2016-04-22 18:54:24 +0200
  • 5f16ad4a58 Update to most recent chainpad Caleb James DeLisle 2016-04-22 18:17:00 +0200
  • 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 +0200
  • d3203d1c2a Remove Crypto from the modules loaded with RequireJS in realtime-input Yann Flory 2016-04-22 14:26:37 +0200
  • 8ac69ca262 Add a missing "time" property in the netflux client causing incorrect timeout errors Yann Flory 2016-04-22 11:46:27 +0200
  • 2c158558f5 use leveldb adaptor by default ansuz 2016-04-22 11:05:54 +0200
  • 60eb8b52a9 listen for websockets on the same port as the httpd ansuz 2016-04-22 10:55:20 +0200
  • e83e5026ce make amnesiadb compatible with netflux ansuz 2016-04-22 10:54:44 +0200
  • be1ef7abe3 migrate canvas to netflux ansuz 2016-04-22 10:04:54 +0200
  • d4943511fe move text/ and hack/ to Netflux ansuz 2016-04-22 09:47:26 +0200
  • 4c95602347 remove a little bit more dead code ansuz 2016-04-22 09:46:41 +0200
  • b140b6429d remove a little bit of dead code ansuz 2016-04-22 09:46:06 +0200
  • 2c6cf9883b stop using deleted file ansuz 2016-04-22 08:19:58 +0200
  • bbdc9da853 delete duplicated file ansuz 2016-04-22 08:19:28 +0200
  • cce50390a0 don't depend on library to set hash ansuz 2016-04-21 19:04:15 +0200
  • 5f4825f3a0 don't change the hash from realtime input ansuz 2016-04-21 19:03:50 +0200
  • d576fdc886 fix bug where empty channels failed ansuz 2016-04-21 19:03:22 +0200
  • 80fb5e1e21 don't rely on RealtimeSocket exporting textPatcher ansuz 2016-04-21 17:59:30 +0200
  • 4f426651ad remove TextPatcher from RealtimeTextSocket ansuz 2016-04-21 17:41:50 +0200
  • 86bbc15017 document modified storage API ansuz 2016-04-21 17:14:59 +0200
  • 7a02d85ec5 Netflux server mustn't send a zero message until the history is synced ansuz 2016-04-21 17:02:54 +0200
  • ce69062b7c implement callback for getMessages ansuz 2016-04-21 17:01:21 +0200
  • a527024a8c start on realtime form prototype ansuz 2016-04-21 15:51:04 +0200
  • 02ff1a63a4 Merge branch 'netflux' into beta ansuz 2016-04-21 15:47:07 +0200
  • 04f6299938 reconcile differences with netflux ansuz 2016-04-21 15:44:56 +0200
  • 565fb1d186 include small snippets for preventing browser fights ansuz 2016-04-21 15:40:29 +0200
  • ffbd428b87 better logging of browser fights ansuz 2016-04-21 15:06:03 +0200
  • 4d44661f3b more correct tests ansuz 2016-04-21 15:05:41 +0200
  • a18c793f98 use latest hyperjson ansuz 2016-04-21 14:53:53 +0200
  • 980ff8a0ca Fix a test that was failing on chrome ansuz 2016-04-21 12:16:48 +0200
  • 9efcc443cd add 'format' to TextPatcher's API ansuz 2016-04-21 12:16:11 +0200
  • 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 +0200
  • e8eb677b0b debugging on the CI Caleb James DeLisle 2016-04-20 20:25:30 +0200
  • eadca92e98 don't repeat travis calling npm install but do use https for https urls Caleb James DeLisle 2016-04-20 20:20:29 +0200
  • 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 +0200
  • 8709311a7e Lets try running with multiple types of browsers Caleb James DeLisle 2016-04-20 19:18:31 +0200
  • 2a0b3a007d Added testing and auto-testing with selenium Caleb James DeLisle 2016-04-20 18:58:02 +0200
  • 0769e50414 move TextPatcher to highest application layer ansuz 2016-04-20 18:56:18 +0200
  • 1d70335228 provide all callbacks before starting ansuz 2016-04-20 18:27:20 +0200
  • 9498937b43 add a FIXME to the assert page ansuz 2016-04-20 18:15:17 +0200
  • b16e53505f It's good to say where the target of your copy command is Caleb James DeLisle 2016-04-20 18:13:55 +0200
  • cf4601281b make .travis.yml look valid Caleb James DeLisle 2016-04-20 18:10:20 +0200
  • a9fba2cbab Ok lets try some automated testing! Caleb James DeLisle 2016-04-20 18:08:01 +0200
  • ae039b0551 remove NetFlux server prototype ansuz 2016-04-20 16:00:28 +0200
  • a3787ee4dc Merge branch 'netflux' into beta ansuz 2016-04-20 15:25:00 +0200
  • 06b464c524 move sheet/ to .git ansuz 2016-04-20 15:04:43 +0200
  • cdf02ac725 remove input pad ansuz 2016-04-20 15:00:21 +0200
  • 11961b4f1d export stringifyDOM to REALTIME_MODULE ansuz 2016-04-20 14:50:56 +0200
  • e68dd31a53 Fix #19 by adding a lock to level db connector Caleb James DeLisle 2016-04-20 14:38:15 +0200
  • 2b9d9ada8b Add a working picture ansuz 2016-04-15 18:19:46 +0200
  • 3fb1d0ed2b Write a document detailing system architecture ansuz 2016-04-15 18:17:58 +0200
  • 5db487db3f remove old pad entirely ansuz 2016-04-20 14:26:56 +0200
  • 010566d3c3 pushDelta was mistakenly deprecated. restored. ansuz 2016-04-20 14:20:34 +0200
  • 7adc7eef22 Merge pull request #18 from xwiki-labs/integrate ansuz 2016-04-20 14:16:53 +0200
  • 1639c5b099 use hyperscript and hyperjson from common ansuz 2016-04-20 14:14:44 +0200
  • 3598c93098 move new hyperjson into common ansuz 2016-04-20 14:14:06 +0200
  • 103bb69daa move custom hyperscript into common ansuz 2016-04-20 14:12:32 +0200
  • e357549eda push browser fights into an array for inspection ansuz 2016-04-20 14:01:21 +0200
  • b83fb7b823 improve brFix logic ansuz 2016-04-20 12:29:16 +0200
  • 1c7954ed51 Grab Fabric off of the window ansuz 2016-04-20 12:13:04 +0200
  • 06786b6e02 Remove redundant declaration ansuz 2016-04-20 10:37:20 +0200
  • df22c246c4 serialize text nodes correctly ansuz 2016-04-20 10:10:26 +0200
  • 302b8c5f04 Merge branch 'master' of github.com:xwiki-labs/cryptpad into integrate ansuz 2016-04-20 10:04:07 +0200
  • 7ca5f47d02 remove multitest pad since it offers no significant benefit ansuz 2016-04-18 17:31:37 +0200
  • bafdd588dd fix /hack/ to not require sharejs textarea ansuz 2016-04-18 17:14:00 +0200
  • f2db6b83eb better sizing for palette options ansuz 2016-04-18 16:40:44 +0200
  • 5ce158d2e2 add more colors ansuz 2016-04-17 20:21:19 +0200
  • cc1814544d install fabricjs ansuz 2016-04-17 20:05:40 +0200
  • 7c4b334ad3 here's a canvas app! ansuz 2016-04-17 20:04:49 +0200
  • 41276fffb5 repair /text/ application, conform to new API ansuz 2016-04-17 14:15:34 +0200
  • cb979844f6 implement text patching at application layer ansuz 2016-04-17 14:06:30 +0200
  • 4a41575e6d accept onLocal in config ansuz 2016-04-17 14:05:05 +0200
  • d3c2c901b6 implement cursor transformation in a common library ansuz 2016-04-17 14:02:45 +0200
  • b71f73455d Add a working picture ansuz 2016-04-15 18:19:46 +0200
  • fe1daa5caf Write a document detailing system architecture ansuz 2016-04-15 18:17:58 +0200
  • 92d89f6cac start to factor sharejs into two modules ansuz 2016-04-15 18:17:45 +0200