Commit Graph

518 Commits

Author SHA1 Message Date
Brian Smith eecbbdcbd4 VRFS-281 initial dev for notification framework 2013-03-21 20:17:28 -04:00
Brian Smith 123b772d23 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-15 01:30:53 -04:00
Seth Call d7e3e8c67e * checking in fix for need for RAILS_ENV=test 2013-03-15 00:28:14 -05:00
Seth Call f84118e5ec * fix for cucumber startup 2013-03-15 00:19:09 -05:00
Brian Smith 06b269d91a refactor common search code to utils.js 2013-03-15 01:18:16 -04:00
Seth Call d318a5de4b * mmm. something is not right with rspec default environment 2013-03-15 00:02:33 -05:00
Seth Call 020719e6fe * VRFS-259: changing order of some things to allow server startup 2013-03-14 23:47:39 -05:00
Seth Call b43e2fa61c Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-14 23:23:43 -05:00
Seth Call f33d05d99c * VRFS-259: beta signup 2013-03-14 23:23:37 -05:00
Jonathon Wilson dd58e9cf49 More DRY mixer controls. Fix bug with mute not having right volume. 2013-03-14 20:44:51 -06:00
Jonathon Wilson 8e8cc779f9 Refactor fader controls: clicking 2013-03-13 21:29:57 -06:00
Brian Smith 8751572596 VRFS-274 hide friends panel when showing search results 2013-03-09 23:28:21 -05:00
Brian Smith c40460e3fb VRFS-274 more sidebar updates 2013-03-09 22:00:34 -05:00
Brian Smith 7cbd5b4e76 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-09 20:57:19 -05:00
Brian Smith a09039f796 VRFS-204 VRFS-274 enhance sidebar search 2013-03-09 20:57:09 -05:00
Jonathon Wilson 4adb3d2492 Re-add missing ParticipantJoined/Left messages to bridge 2013-03-08 12:46:56 -07:00
Jonathon Wilson 081472060d Add additional websocket message logging info 2013-03-08 08:34:05 -07:00
Seth Call 6bf0f499bd Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-08 00:45:11 -06:00
Seth Call bedd624609 * midway through signup changes 2013-03-08 00:45:06 -06:00
Jonathon Wilson 2cff8710a0 Guard against users with no defined instruments 2013-03-05 08:51:20 -07:00
Brian Smith 546fdf608c fix test 2013-03-03 22:39:10 -05:00
Brian Smith 2e9a65dbf8 VRFS-206 remove hardcoded friend list in sidebar 2013-03-03 22:38:12 -05:00
Brian Smith 46fa3c5580 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-03-02 19:31:07 -05:00
Brian Smith 33a152facb VRFS-262 wire up Connect button 2013-03-02 19:30:26 -05:00
Seth Call 506b3fc5d9 * VRFS-259: beginnings of new user flow 2013-03-01 07:36:25 -06:00
Jonathan Kolyer 0b7a57df1d vrfs192: added assertion that all expected js functions are called without error 2013-02-28 20:31:56 -06:00
Jonathan Kolyer e946c35d57 vrfs192: added comments 2013-02-28 20:17:31 -06:00
Jonathan Kolyer 6e6851f7c2 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-02-28 19:51:24 -06:00
Jonathon Wilson 0cb7a3feb8 Merge branch 'jon' 2013-03-02 12:03:06 -07:00
Jonathon Wilson 0af7f696ca Refactor session model, joining, leaving, refreshing. 2013-03-02 12:02:42 -07:00
Brian Smith 9c12455407 refactored instrument logo maps to central location 2013-03-01 00:04:42 -05:00
Brian Smith b303fbce20 VRFS-260 more styling / functional updates to search results 2013-02-28 23:38:15 -05:00
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