Brian Smith
|
e9221f6291
|
incorporated feedback from David
|
2013-02-07 19:32:17 -05:00 |
|
Brian Smith
|
07cf73ea2d
|
1 more bug fix
|
2013-02-07 02:41:46 -05:00 |
|
Brian Smith
|
c6d3c7487b
|
fixed filter bugs
|
2013-02-07 02:38:35 -05:00 |
|
Brian Smith
|
e542e7cd30
|
bug fixes
|
2013-02-07 02:14:45 -05:00 |
|
Brian Smith
|
0e280795e4
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-07 00:22:09 -05:00 |
Jonathon Wilson
|
bc27cc1117
|
VRFS-234. Wire up main volume slider.
|
2013-02-06 21:58:41 -07:00 |
|
Brian Smith
|
8dc1b6334f
|
VRFS-232 Find Session style fixes
|
2013-02-06 23:24:35 -05:00 |
|
Brian Smith
|
04f2128849
|
VRFS-233 Create Session style fixes
|
2013-02-06 22:42:51 -05:00 |
|
Brian Smith
|
6794547b11
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-ruby
|
2013-02-06 21:18:17 -05:00 |
|
Brian Smith
|
d4ee39d6ff
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-06 20:41:46 -05:00 |
Jonathan Kolyer
|
2140eff3bd
|
vrfs192: added aasm gem; added max_reconnect_time parameter
|
2013-02-06 07:43:26 -06:00 |
|
Jonathan Kolyer
|
be981979c8
|
vrfs192: added tests for connection state and removing/flagging stale connections
|
2013-02-06 07:14:00 -06:00 |
|
Jonathan Kolyer
|
f737cc8a72
|
vrfs192: added aasm gem
|
2013-02-06 07:12:58 -06:00 |
|
Jonathan Kolyer
|
f7728cc9fc
|
vrfs192: added AASM logic
|
2013-02-06 07:12:36 -06:00 |
|
Jonathan Kolyer
|
755d3a9025
|
vrfs192: added music_session_id to login_ack method
|
2013-02-06 07:11:31 -06:00 |
|
Jonathan Kolyer
|
6a31e05bbd
|
vrfs192: added flag_stale_connections method; updated remove_stale_connections and create_connection
|
2013-02-06 07:11:05 -06:00 |
|
Jonathan Kolyer
|
2c0107f46a
|
added music_session_id to LoginAck
|
2013-02-06 07:08:15 -06:00 |
|
Jonathan Kolyer
|
3e9b4515ea
|
vrfs192: added connection.aasm_state column
|
2013-02-06 07:07:05 -06:00 |
|
Jonathan Kolyer
|
cd16c76f56
|
vrfs 192: added max_reconnect_time variable; added aasm/thin gems; integrated connection.aasm_state into participant REST
|
2013-02-06 07:00:51 -06:00 |
 Seth Call
|
452a032948
|
* artifact update
|
2013-02-05 23:17:15 -06:00 |
|
Jonathon Wilson
|
4bdc3b0859
|
VRFS-234. Add recordings section. Leave button works. Wrap track name.
|
2013-02-05 22:16:17 -07:00 |
|
Seth Call
|
47cc69a5f0
|
* adding artifact_updte table
|
2013-02-05 23:14:07 -06:00 |
|
Seth Call
|
6f0888a43e
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-05 23:01:41 -06:00 |
|
Seth Call
|
b1054187fd
|
* VRFS-215; changing versioncheck to be a REST API
|
2013-02-05 23:01:12 -06:00 |
|
Jonathon Wilson
|
013924d70b
|
VRFS-231. VRFS-234. Fixes for home screen and session screen.
|
2013-02-05 21:32:56 -07:00 |
|
Seth Call
|
0c61596b4a
|
*
|
2013-02-05 20:32:07 -06:00 |
|
Brian Smith
|
0e4163ebe4
|
allow only 1 genre
|
2013-02-05 03:06:09 -05:00 |
|
Brian Smith
|
f979c35faf
|
style updates / only allow 1 genre now
|
2013-02-05 02:58:19 -05:00 |
|
Jonathon Wilson
|
8a8ea89811
|
Work to get right tracks into right parts of session screen. Add live tracks section
|
2013-02-04 22:11:04 -07:00 |
|
Seth Call
|
a48df541c2
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-04 21:24:24 -06:00 |
|
Seth Call
|
aece9f5638
|
* spike controller; useful for dummy web pages to show WIP or hard integration problems
|
2013-02-04 21:24:13 -06:00 |
Mike Slemmer
|
ca2bc4ff7e
|
more work
|
2013-02-04 18:07:49 -08:00 |
|
Mike Slemmer
|
4f4b7219d8
|
more work
|
2013-02-04 18:07:08 -08:00 |
|
Mike Slemmer
|
760a2147f8
|
more work
|
2013-02-04 11:25:54 -08:00 |
|
Mike Slemmer
|
8766dadf08
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-04 11:18:46 -08:00 |
|
Mike Slemmer
|
5052af30f6
|
more work
|
2013-02-04 11:18:32 -08:00 |
|
Mike Slemmer
|
cfd5af8c95
|
more work
|
2013-02-04 11:12:20 -08:00 |
|
Seth Call
|
b2887b3ff3
|
* adding DRIVER=selenium override if you want selenium instead
|
2013-02-03 21:06:55 -06:00 |
|
Seth Call
|
6c80e455b1
|
* remove prebuilt assets ; the right way this time
|
2013-02-03 20:35:32 -06:00 |
|
Seth Call
|
78eacf1810
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-03 20:32:36 -06:00 |
|
Seth Call
|
cfec1eea32
|
* remove prebuilt assets
|
2013-02-03 20:32:27 -06:00 |
|
Jonathon Wilson
|
80f3e792d6
|
Fix offscreen locations to not leak onto visible screen
|
2013-02-03 16:33:03 -07:00 |
|
Jonathon Wilson
|
015921b08c
|
Get gain control actually controlling audio. Refactor for cleaner code for mute.
|
2013-02-03 15:47:17 -07:00 |
|
Jonathon Wilson
|
0671587efa
|
Vertical faders working correctly, visually
|
2013-02-03 12:48:39 -07:00 |
|
Jonathon Wilson
|
a5835f13a3
|
Start of dragging support for faders
|
2013-02-03 11:24:20 -07:00 |
|
Jonathon Wilson
|
8551facca4
|
Allow move of fader handle by direct click to move point
|
2013-02-03 11:24:20 -07:00 |
|
Jonathon Wilson
|
0ea4f447a3
|
Fake client always returns mixers in group 2 for now
|
2013-02-03 11:24:20 -07:00 |
|
Jonathon Wilson
|
17bdecfee3
|
Provide a fake trackVolumeObject when not on desktop client
|
2013-02-03 11:24:20 -07:00 |
|
Jonathon Wilson
|
18ccf7b738
|
Fix cucumber test
|
2013-02-03 11:22:33 -07:00 |
|
Seth Call
|
875090ed1d
|
* switching to webkit for cucumber. I want to make selenium an option again, and also stop spiting out the console logs to the stdout; but for now this is very useful as we debug what is going on
|
2013-02-03 11:19:39 -06:00 |