Brian Smith
|
a02fe64677
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-28 23:25:51 -05:00 |
Jonathan Kolyer
|
46b1a47217
|
vrfs192: added TEST_CONNECT_STATES bracked for connection states testing logic; added Capaybara::Poltergeist support; added connection_state.html.rb and associated actions/routes/tests for running connection state test suite in dev or test env
|
2013-02-28 19:51:15 -06:00 |
|
Jonathan Kolyer
|
c93dc9cb44
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-28 12:45:11 -06:00 |
|
Jonathan Kolyer
|
4c6b6ea0bc
|
vrfs192: code cleanup
|
2013-02-28 12:44:33 -06:00 |
|
Jonathan Kolyer
|
1fd8fccd38
|
vrfs192: commenting code
|
2013-02-28 12:03:21 -06:00 |
|
Jonathan Kolyer
|
1f065181b9
|
vrfs192: formatting code
|
2013-02-28 11:58:21 -06:00 |
|
Jonathan Kolyer
|
f4f6a28758
|
vrfs192: full cycle testing completed
|
2013-02-28 11:50:05 -06:00 |
|
Jonathan Kolyer
|
66670137eb
|
vrfs192: test bed for wsg heartbeat connction state mgmt
|
2013-02-28 09:48:21 -06:00 |
|
Jonathan Kolyer
|
efa57d68a9
|
vrfs192: added remember_tokencookie assignment in loggedIn() function
|
2013-02-28 09:46:48 -06:00 |
|
Jonathan Kolyer
|
bd82e1a1f4
|
refactored server.onOpen, breaking out rememberLogin function
|
2013-02-28 09:44:34 -06:00 |
Jonathon Wilson
|
613c51177c
|
Add higher contrast mouse over effect to home screen
|
2013-02-28 08:23:33 -07:00 |
|
Brian Smith
|
ded9045cf9
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-27 21:37:34 -05:00 |
|
Brian Smith
|
f56d6d322d
|
VRFS-260 client search enhancements
|
2013-02-27 17:45:07 -05:00 |
|
Jonathon Wilson
|
4aa63a4f31
|
Code cleanup
|
2013-02-25 21:36:23 -07:00 |
|
Jonathon Wilson
|
c46647288d
|
Remove commented lines
|
2013-02-25 21:35:00 -07:00 |
|
Jonathon Wilson
|
48f2cab8a7
|
Remove websocket subscription duality. JamServer is the only place now.
|
2013-02-25 21:32:02 -07:00 |
|
Jonathon Wilson
|
1db0958c6f
|
Error handling paths. Some test fixes
|
2013-02-25 20:54:09 -07:00 |
|
Jonathan Kolyer
|
5f67bf9234
|
in loggedIn, assign client_id cookie from payload
|
2013-02-21 19:43:30 -06:00 |
|
Jonathan Kolyer
|
16e28b5f3d
|
added arg client_id from cookie to login_with_token
|
2013-02-21 19:42:56 -06:00 |
|
Jonathan Kolyer
|
a9f815ee52
|
from add_client, removed warning when connection still exists; in handle_login retrieve connection earlier and create new client_id if no connection object; in handle_heartbeat, reconnect the connection and touch updated_at inside connection_manager
|
2013-02-21 19:41:09 -06:00 |
|
Jonathan Kolyer
|
54d0675672
|
added reconnect method
|
2013-02-21 19:34:04 -06:00 |
|
Jonathan Kolyer
|
876e897ac5
|
removed debug stmt
|
2013-02-21 14:18:17 -06:00 |
|
Jonathan Kolyer
|
6043aa59e2
|
vrfs192: _handleLoginAck was not getting called due to refactoring, to fix merged the code into loggedIn; added this.heartbeatActive to enable testing
|
2013-02-21 14:09:05 -06:00 |
|
Jonathan Kolyer
|
c1dc7d9967
|
added msg arg to debug for send_to_client
|
2013-02-21 14:06:35 -06:00 |
|
Jonathan Kolyer
|
991312f6ad
|
removed debug stmts
|
2013-02-21 13:38:18 -06:00 |
|
Jonathan Kolyer
|
d794482ab0
|
updated the expire duration by subtracting the stale time; replaced ConnectionManager.expire_stale_connections with stale_connection_client_ids and call to @router.cleanup_clients_with_ids
|
2013-02-21 11:53:10 -06:00 |
|
Jonathan Kolyer
|
71cea79f36
|
added method stale_client, cleanup_clients_with_ids; in handle_heartbeat added updating of connection state
|
2013-02-21 11:49:32 -06:00 |
|
Jonathan Kolyer
|
1b62522ce3
|
vrfs192: added stale_connection_client_ids and flag_connection_stale_with_client_ids to allow websocket-gateway ability to cleanup when stale connection is deleted
|
2013-02-21 11:36:58 -06:00 |
|
Brian Smith
|
800f4d7de0
|
comment old recording code
|
2013-02-16 16:19:08 -05:00 |
|
Brian Smith
|
aa19d59914
|
limit to 1 genre
|
2013-02-16 16:10:45 -05:00 |
 Seth Call
|
c229405069
|
* clear tracks out and reassert the list
|
2013-02-16 09:01:06 -06:00 |
|
Seth Call
|
69fd8f7cfa
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-web
|
2013-02-16 08:56:50 -06:00 |
|
Seth Call
|
23f56c1347
|
* VRFS-254; tracks aren't doubled up on join
|
2013-02-16 08:56:40 -06:00 |
|
Jonathon Wilson
|
2c726b352f
|
Video fixes related to instrument icons
|
2013-02-16 06:51:28 -07:00 |
Mike Slemmer
|
ca8f231a02
|
put back in recorded_tracks
|
2013-02-16 01:34:30 -08:00 |
|
Mike Slemmer
|
997d0e3563
|
Fix for broken test
|
2013-02-16 01:33:58 -08:00 |
|
Mike Slemmer
|
42596d6506
|
Merge branch 'slemmer_20130122'
|
2013-02-16 01:23:57 -08:00 |
|
Jonathon Wilson
|
109a589ff3
|
Home screen look. ben/craig avatars.
|
2013-02-15 18:54:15 -07:00 |
|
Jonathon Wilson
|
269cb4b85c
|
Fix tests for no FTUE at the moment.
|
2013-02-15 09:15:18 -07:00 |
|
Jonathon Wilson
|
e6e0ad4c5c
|
Visual fixes for video
|
2013-02-15 08:44:37 -07:00 |
|
Jonathon Wilson
|
57afa4af76
|
Tracks coming/going properly. Remote VUs working
|
2013-02-14 22:15:36 -07:00 |
|
Jonathon Wilson
|
54469c68b4
|
Skeleton for Search Results
|
2013-02-14 00:48:01 -07:00 |
|
Jonathon Wilson
|
1fb40b5540
|
Invert participants/mixers when drawing tracks. Add timers to find mixers later as they show up. Remove hack to add client id to local tracks (bridge doing it now)
|
2013-02-14 00:02:05 -07:00 |
|
Seth Call
|
4c2b9ab6ec
|
Merge branch 'master' of bitbucket.org:jamkazam/jam-admin
|
2013-02-13 21:35:11 -06:00 |
|
Seth Call
|
4fdaae875b
|
* removing superflous launchy refeence
|
2013-02-13 21:25:17 -06:00 |
|
Brian Smith
|
0d9d8af52b
|
fix build issue
|
2013-02-13 22:22:02 -05:00 |
|
Brian Smith
|
6ac3c475da
|
revert joinSession
|
2013-02-13 21:10:42 -05:00 |
|
Brian Smith
|
de83d8353b
|
added code to pull in local track config (not used yet) / styling fixes
|
2013-02-13 21:04:54 -05:00 |
|
Brian Smith
|
d05edc371c
|
order user instruments by proficiency / priority
|
2013-02-13 02:09:31 -05:00 |
|
Seth Call
|
81008b5dfc
|
* prefering aasm with version matching jam-ruby
|
2013-02-13 00:52:32 -06:00 |