Gráfico de Commits

  • 725cd5f1bf Merge branch 'master' of https://github.com/openexp/OpenEXP master Alex Castillo 2016-04-26 23:23:55 -04:00
  • 6adfb0ea87 Added chart components Alex Castillo 2016-04-26 23:20:46 -04:00
  • a1e96ba49e Update README.md Andy Heusser 2016-03-15 17:19:17 -04:00
  • d397f21c57 Update README.md Andy Heusser 2016-03-15 17:18:29 -04:00
  • 84cb358a65 upload screenshot Andy Heusser 2016-03-15 17:17:06 -04:00
  • c453eedd30 Update README.md Andy Heusser 2016-03-08 09:21:16 -05:00
  • 57b5139dcb Merge pull request #59 from pushtheworldllc/electron-dmg Austin Shoecraft 2016-03-07 10:31:49 -05:00
  • 2f87879a1a ADD .dmg packing scripts AJ Keller 2016-02-29 11:17:32 -05:00
  • 885e0b89fc Update LICENSE Teon L Brooks 2016-02-28 20:36:05 -05:00
  • cb7e40886f Update package.json Teon L Brooks 2016-02-26 02:33:48 -05:00
  • c5b6f1abda Merge pull request #58 from andyh616/triggerTest Teon L Brooks 2016-02-18 15:32:52 -05:00
  • 66a6939508 FIX commas andyh616 2016-02-18 09:26:24 -05:00
  • 46f2b0a4c8 fixed tons code review comments andyh616 2016-02-18 07:48:12 -05:00
  • 17dc3601d7 last fix for this PR andyh616 2016-02-17 12:11:45 -05:00
  • 2e295e51f7 removed some fluff andyh616 2016-02-17 12:09:42 -05:00
  • 63f38fa32b fixed all the routes andyh616 2016-02-17 12:04:49 -05:00
  • 8c4facd350 ADD active class on experiments andyh616 2016-02-15 23:49:37 -05:00
  • c344f2592d Merge pull request #56 from andyh616/triggerTest Teon L Brooks 2016-02-15 13:33:05 -05:00
  • d2438ba4a2 fixed indent andyh616 2016-02-15 13:31:38 -05:00
  • b67b5550f9 fix paths andyh616 2016-02-15 10:37:20 -05:00
  • 8c3678d3cf fixed local experiment paths andyh616 2016-02-15 10:23:16 -05:00
  • 0b0cc323c5 changed links to experiment states andyh616 2016-02-14 18:02:38 -05:00
  • feb9212aba reorganized experiments into local and remote andyh616 2016-02-14 17:39:11 -05:00
  • a7b7a6ddf6 ADD experiments ui andyh616 2016-02-14 00:32:46 -05:00
  • f8e46752a4 Update simulator andyh616 2016-02-12 13:28:01 -05:00
  • 476a32e5a0 Merge pull request #55 from andyh616/lightning Austin Shoecraft 2016-01-28 16:43:42 -05:00
  • 6e684be62d ADD authors andyh616 2016-01-28 11:56:58 -05:00
  • f85caa9ceb Merge pull request #54 from tashoecraft/sdkErrorFix Andy Heusser 2016-01-28 10:04:18 -05:00
  • b3e0ecfebd ADD auto-connect, updated connect controller andyh616 2016-01-27 22:51:05 -05:00
  • 62b6577730 remved openbci from vendor.js Austin 2016-01-27 18:44:32 -05:00
  • 4d223b3900 Merge pull request #46 from andyh616/lightning Teon L Brooks 2016-01-27 15:18:37 +01:00
  • 20b35b0f43 Merge pull request #52 from andyh616/patch-2 Austin Shoecraft 2016-01-25 09:55:31 -05:00
  • f3547aeb1d Update README.md Andy Heusser 2016-01-25 07:51:49 -05:00
  • 015d62b38a FIX spacing on login page andyh616 2016-01-24 10:29:30 -05:00
  • 91299338ae ADD auto-connect to connect page andyh616 2016-01-24 09:18:13 -05:00
  • 66958fbca1 Saving minor changes andyh616 2016-01-12 17:47:57 -05:00
  • 8d2f920f3d UPDATE navbar, ADD login ADD analyze page ADD loading state ADD settings tab andyh616 2016-01-04 17:27:32 -05:00
  • fa973b4d78 Merge pull request #49 from tashoecraft/simRunning Andy Heusser 2016-01-12 17:28:38 -05:00
  • 3b8ac7d275 sim is up Austin 2016-01-12 09:18:19 -05:00
  • 8bf1c3f39b getting sim running Austin 2016-01-11 09:57:21 -05:00
  • 065eaa7a03 saving Austin 2016-01-06 12:34:07 -05:00
  • e26816b1e3 building connect page Austin 2016-01-05 15:54:30 -05:00
  • a1d30fbc6c resolved conflicts in package.json Austin 2016-01-12 09:19:52 -05:00
  • de8a51601b Update README.md Andy Heusser 2016-01-11 08:11:29 -05:00
  • 11e2ff18be Update README.md Andy Heusser 2016-01-11 08:11:06 -05:00
  • 856c1f86b1 Update README.md Andy Heusser 2016-01-11 08:10:21 -05:00
  • a424cef2e8 Update readme Andy Heusser 2016-01-11 08:09:10 -05:00
  • 6086e7df97 Bump up openbci-sdk version Teon L Brooks 2016-01-04 17:25:59 -05:00
  • 539b681c60 Merge pull request #44 from tashoecraft/experiments Andy Heusser 2016-01-04 12:15:19 -05:00
  • 777e39d9d3 updated controllers naming and moved experiments logic inside controller Austin 2016-01-04 10:35:28 -05:00
  • e097efa2ff Merge pull request #43 from tashoecraft/styling Andy Heusser 2015-12-30 12:07:22 -05:00
  • 957012f9fd added ability to load styles Austin 2015-12-30 10:56:57 -05:00
  • 9f236e3c22 Merge pull request #41 from teonlamont/img Andy Heusser 2015-12-29 17:38:38 -05:00
  • 5d1b262480 Change img reference teonlamont 2015-12-29 17:31:49 -05:00
  • 84b1294381 Merge pull request #37 from andyh616/master Teon L Brooks 2015-12-29 16:42:50 -05:00
  • 964539478b FIX jspsych andyh616 2015-12-29 14:51:42 -05:00
  • cf9104b0ba Merge pull request #36 from tashoecraft/improvedDevReload Teon L Brooks 2015-12-29 15:13:28 -05:00
  • 4a757d80f2 removed merge conflict Austin 2015-12-29 13:55:22 -05:00
  • 0e23ff901d Merge pull request #31 from andyh616/master Andy Heusser 2015-12-29 14:18:16 -05:00
  • 5db67b142e Merge pull request #35 from teonlamont/rotator Teon L Brooks 2015-12-29 13:17:14 -05:00
  • d22e411a00 removed rotator jQuery plugin Austin 2015-12-29 09:23:33 -05:00
  • dadbf0adc1 moved webpack to dependencies Austin 2015-12-29 09:27:26 -05:00
  • 54a0c99fea FIX a few more paths andyh616 2015-12-29 11:22:09 -05:00
  • fededd83db FIX connect template path andyh616 2015-12-29 11:02:45 -05:00
  • 96abfc3d09 Update dependencies, RM git submodule teonlamont 2015-12-27 20:39:09 -05:00
  • d0dc548e54 Merge pull request #16 from OpenBCI/electronChangeOver-rebased Teon L Brooks 2015-12-22 23:29:17 -05:00
  • 07cb3b32aa Only gives a quarter spin teonlamont 2015-12-22 22:42:45 -05:00
  • 3a48253b1c Accidental webpack.config.js during rebase teonlamont 2015-12-22 22:42:36 -05:00
  • 274c956c41 FIX submodule, image loc, MV jsPsych teonlamont 2015-12-22 21:19:45 -05:00
  • 41b22dea28 saving Austin 2015-12-21 15:49:27 -05:00
  • 269ce422e2 saving fixes Austin 2015-12-21 13:41:31 -05:00
  • 8de9b4eb0d it's running Austin 2015-12-21 13:31:22 -05:00
  • c4598d94d9 switch to dev server Austin 2015-12-20 14:52:45 -05:00
  • 3f954076b1 dev tools appear on launch Austin 2015-12-20 14:45:27 -05:00
  • 7f6976967c start of refactor Austin 2015-12-05 19:32:59 -05:00
  • 7df6e9dfab Update README.md, FIX version v0.1 express Teon L Brooks 2015-12-19 02:30:04 -05:00
  • c55b33ecf8 Add Gitter badge The Gitter Badger 2015-12-18 04:28:30 +00:00
  • 6462dd9efb ADD disable connect button andyh616 2015-12-01 17:26:19 -05:00
  • ff9990a5f4 Update readme.md teonlamont 2015-11-30 18:48:08 -05:00
  • e52225dfd4 FIX trigger, end data stream teonlamont 2015-11-30 18:01:31 -05:00
  • 2dd3e1f90e FIX triggerTest teonlamont 2015-11-30 13:13:39 -05:00
  • e8afdf8d12 Update triggerTest for angular.js teonlamont 2015-11-23 15:38:46 -05:00
  • ef131def3f Simplify to one image teonlamont 2015-11-23 00:25:58 -05:00
  • 1ecf9329f8 ADD triggerTest teonlamont 2015-11-22 23:19:56 -05:00
  • 05baa6025e Open browser by default teonlamont 2015-11-30 12:57:06 -05:00
  • 65d1e609d1 ADD start/stop button andyh616 2015-11-30 17:13:37 -05:00
  • 73927da49d ADD connect page andyh616 2015-11-30 10:28:23 -05:00
  • d813dbf7d1 UPDATE dependencies andyh616 2015-11-28 10:18:53 -05:00
  • 613acc1a59 ADD connecting to device capability andyh616 2015-11-28 08:45:34 -05:00
  • feec5bc775 Update README.md Andy Heusser 2015-11-28 07:29:38 -05:00
  • ecde6c0d30 Update README.md Andy Heusser 2015-11-28 07:29:04 -05:00
  • b4780f7336 ADD device selection capability andyh616 2015-11-28 07:23:13 -05:00
  • 69c5a4f419 organized for angular andyh616 2015-11-24 16:30:54 -05:00
  • 77de88d5b8 fixed angular.js loading in partials andyh616 2015-11-22 18:48:26 -05:00
  • ae44033fbb latest non functional version andyh616 2015-11-20 16:23:25 -05:00
  • 2000ab44ff reconfiguring OpenEXP to use the MEAN stack andyh616 2015-11-20 11:52:27 -05:00
  • 492bdc9774 FIX: allow for scripts to work without trigger declared teonlamont 2015-11-24 22:07:48 -05:00
  • 3f515218b4 UPDATE temp redirect for submodule teonlamont 2015-11-22 23:11:43 -05:00
  • 9b3ed8e4fb Merge pull request #4 from waffle-iron/master Teon L Brooks 2015-11-20 15:38:13 -05:00
  • 54e2f4dec5 add waffle.io badge Making GitHub Delicious 2015-11-20 13:37:52 -07:00