725cd5f1bf
Merge branch 'master' of https://github.com/openexp/OpenEXP
2016-04-26 23:23:55 -04:00
6adfb0ea87
Added chart components
2016-04-26 23:20:46 -04:00
a1e96ba49e
Update README.md
2016-03-15 17:19:17 -04:00
d397f21c57
Update README.md
2016-03-15 17:18:29 -04:00
84cb358a65
upload screenshot
2016-03-15 17:17:06 -04:00
c453eedd30
Update README.md
2016-03-08 09:21:16 -05:00
57b5139dcb
Merge pull request #59 from pushtheworldllc/electron-dmg
...
ADD .dmg packing scripts
2016-03-07 10:31:49 -05:00
2f87879a1a
ADD .dmg packing scripts
2016-02-29 11:17:32 -05:00
885e0b89fc
Update LICENSE
2016-02-28 20:36:05 -05:00
cb7e40886f
Update package.json
2016-02-26 02:33:48 -05:00
c5b6f1abda
Merge pull request #58 from andyh616/triggerTest
...
FIX routes
2016-02-18 15:32:52 -05:00
66a6939508
FIX commas
...
forgot some commas :)
2016-02-18 09:26:24 -05:00
46f2b0a4c8
fixed tons code review comments
...
thanks teon!
2016-02-18 07:48:12 -05:00
17dc3601d7
last fix for this PR
...
added back the urls for the local experiments
2016-02-17 12:11:45 -05:00
2e295e51f7
removed some fluff
2016-02-17 12:09:42 -05:00
63f38fa32b
fixed all the routes
...
the state url’s weren’t working properly. this patch fixes all of those
path references
2016-02-17 12:04:49 -05:00
8c4facd350
ADD active class on experiments
...
also, cleaned up some ui-ref paths that were wrong. still not
completely fixed. when in the experiments.local substate, you can’t
transition to any of the other navbar linked states (i.e. connect, viz)
without it first taking you to home
2016-02-15 23:49:37 -05:00
c344f2592d
Merge pull request #56 from andyh616/triggerTest
...
Update simulator
2016-02-15 13:33:05 -05:00
d2438ba4a2
fixed indent
2016-02-15 13:31:38 -05:00
b67b5550f9
fix paths
2016-02-15 10:37:20 -05:00
8c3678d3cf
fixed local experiment paths
2016-02-15 10:23:16 -05:00
0b0cc323c5
changed links to experiment states
2016-02-14 18:02:38 -05:00
feb9212aba
reorganized experiments into local and remote
...
the experiments tab are now organized into a local and remote. local
experiments will come with the app, and can be loaded in from the local
computer. the remote tab will allow the user to connect to a remote
database to retrieve experiments. the remote database is not set up
yet.
2016-02-14 17:39:11 -05:00
a7b7a6ddf6
ADD experiments ui
...
started building the ui for displaying experiments with a description,
a link etc.
made edits from last commit
2016-02-14 00:32:46 -05:00
f8e46752a4
Update simulator
...
-we removed the simulatorFactory because its now built into the board
by default
-moved the stream buttons to the dashboard page
2016-02-12 13:28:01 -05:00
476a32e5a0
Merge pull request #55 from andyh616/lightning
...
ADD auto-connect, updated connect controller
2016-01-28 16:43:42 -05:00
6e684be62d
ADD authors
2016-01-28 11:56:58 -05:00
f85caa9ceb
Merge pull request #54 from tashoecraft/sdkErrorFix
...
removed openbci from vendor.js
2016-01-28 10:04:18 -05:00
b3e0ecfebd
ADD auto-connect, updated connect controller
...
-added auto-connecting to board if found, otherwise lists available
devices
-removed /dev/cu. by splitting string on the .
-injected board/simulator factories into dashboard controller
-updated experiments page to run trigger test (requires modified
version of jspsych
-UX work on the navbar
2016-01-27 22:51:05 -05:00
62b6577730
remved openbci from vendor.js
2016-01-27 18:44:32 -05:00
4d223b3900
Merge pull request #46 from andyh616/lightning
...
Updated navbar, Added login state
2016-01-27 15:18:37 +01:00
20b35b0f43
Merge pull request #52 from andyh616/patch-2
...
Update README.md
2016-01-25 09:55:31 -05:00
f3547aeb1d
Update README.md
2016-01-25 07:51:49 -05:00
015d62b38a
FIX spacing on login page
...
fixed the spacing
2016-01-24 10:29:30 -05:00
91299338ae
ADD auto-connect to connect page
...
When the user presses the connect button, the app will first try to
auto connect to the device, and if that doesn’t work, it’ll return an
array of available devices that will be automatically displayed to the
screen.
This update relies on a listPorts method that I added to the
openbci-sdk.
2016-01-24 09:18:13 -05:00
66958fbca1
Saving minor changes
2016-01-12 17:47:57 -05:00
8d2f920f3d
UPDATE navbar, ADD login
...
ADD analyze page
ADD loading state
ADD settings tab
2016-01-12 17:42:39 -05:00
fa973b4d78
Merge pull request #49 from tashoecraft/simRunning
...
Simulator running
2016-01-12 17:28:38 -05:00
3b8ac7d275
sim is up
2016-01-12 09:20:41 -05:00
8bf1c3f39b
getting sim running
2016-01-12 09:20:41 -05:00
065eaa7a03
saving
2016-01-12 09:20:41 -05:00
e26816b1e3
building connect page
2016-01-12 09:20:41 -05:00
a1d30fbc6c
resolved conflicts in package.json
2016-01-12 09:19:52 -05:00
de8a51601b
Update README.md
2016-01-11 08:11:29 -05:00
11e2ff18be
Update README.md
2016-01-11 08:11:06 -05:00
856c1f86b1
Update README.md
2016-01-11 08:10:21 -05:00
a424cef2e8
Update readme
2016-01-11 08:09:10 -05:00
6086e7df97
Bump up openbci-sdk version
2016-01-04 17:25:59 -05:00
539b681c60
Merge pull request #44 from tashoecraft/experiments
...
updated controllers naming and moved experiments logic inside controller
2016-01-04 12:15:19 -05:00
777e39d9d3
updated controllers naming and moved experiments logic inside controller
2016-01-04 10:35:28 -05:00
Alex Castillo