Commit Graph

1869 Commits

Author SHA1 Message Date
Brian Smith 0dfd122316 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-09-17 00:06:47 -04:00
Brian Smith 99774759cc VRFS-677 mark chat devices as unassigned 2013-09-17 00:06:31 -04:00
Seth Call e0980d5336 * VRFS-606 - disable text selection in in-session and ftue 2013-09-17 02:20:22 +00:00
Seth Call e76fc73595 * VRFS-438 - squirt out BUILD_NUMBER into file and make debian packages reference it when it starts the app so that gem versions can be found 2013-09-16 17:03:26 +00:00
Seth Call fbb9009fcb * fix another copy/paste bug in admin build script 2013-09-16 04:27:14 +00:00
Seth Call 1085686970 * fixing jam-admin's build and Gemfile for merging into jam-cloud 2013-09-16 03:19:10 +00:00
Seth Call c8150c8aee merging jam-admin into admin 2013-09-16 03:15:31 +00:00
Seth Call 3d415ec447 * removing more reference to workspace 2013-09-16 02:42:02 +00:00
Seth Call 85cac2a014 * fixing more path changes 2013-09-16 02:36:21 +00:00
Seth Call 1082a7386a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-09-16 02:28:52 +00:00
Seth Call 4d723bacaf * fixing relative paths in gems for develop branch as well 2013-09-16 02:28:44 +00:00
Jonathon Wilson 1d36dcb88f VRFS-648. Use Peter's new resync function instead of FTUESave. 2013-09-15 19:55:12 -06:00
Seth Call 00bb84e7b7 * test commit 2013-09-15 18:33:59 +00:00
Seth Call a112391be1 * VRFS-438; collapsing all repos into one; requires modification of build files 2013-09-15 18:15:16 +00:00
Seth Call eba03124d4 * VRFS-438; collapsing all repos into one; requires modification of build files 2013-09-15 18:13:31 +00:00
Seth Call f78b6f7868 merging websocket-gateway into websocket-gateway 2013-09-15 18:07:00 +00:00
Seth Call 2f41675471 merging jam-web into web 2013-09-15 18:04:37 +00:00
Seth Call 6ea4bae05c merging jam-ruby into ruby 2013-09-15 18:04:03 +00:00
Seth Call 745bdac2a2 merging jam-pb into pb 2013-09-15 18:02:25 +00:00
Seth Call a091c22aa6 merging jam-db into db 2013-09-15 17:58:54 +00:00
Anthony Davis a29fe05862 VRFS-673 fixing version style in footer 2013-09-15 17:17:22 +00:00
Anthony Davis f8b0a3ea51 VRFS-673 fixing version style in footer 2013-09-15 17:15:40 +00:00
Anthony Davis c3f43bdd10 VRFS-673 fixing version style in footer 2013-09-15 17:14:31 +00:00
Brian Smith 4005f757a2 Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-09-15 08:38:11 -04:00
Brian Smith fbb71ae4b7 VRFS-675 added logging to help debug 2013-09-15 08:37:57 -04:00
Anthony Davis e6157dc129 VRFS-673 adding "version" id 2013-09-14 20:14:12 +00:00
Anthony Davis ed6028c3e4 VRFS-673 came back to this one, not sure which CSS is being applied! 2013-09-14 20:13:07 +00:00
Seth Call 1d3ed37599 * changing the SEND TO CLIENT to include type 2013-09-14 19:58:01 +00:00
Seth Call e886b21139 * printing type 2013-09-14 19:57:20 +00:00
Seth Call 8ecd553fc4 Initial commit 2013-09-14 19:48:45 +00:00
Anthony Davis fa53649503 VRFS-673 added div id "version" to footer 2013-09-14 19:23:41 +00:00
Anthony Davis aa2b928777 VRFS-673 - tweaking version formatting in footer 2013-09-14 19:19:53 +00:00
Jonathon Wilson 48454f6785 VRFS-669. Subscribe to FTUE faders using correct fader id 2013-09-14 11:45:35 -06:00
Jonathon Wilson 83b6383fc1 VRFS-648. Add Resync button to session screen. 2013-09-14 11:27:03 -06:00
Brian Smith bc2b52196e VRFS-668 do not allow more than 1 voice chat input 2013-09-13 23:29:49 -04:00
Brian Smith 08938e7e8e VRFS-668 voice chat changes corresponding to backend client changes 2013-09-13 23:18:53 -04:00
Brian Smith 501010d74a fix issue with Add New Audio Gear dialog 2013-09-12 08:02:13 -04:00
Brian Smith cdee76f793 fix issue with cancel button 2013-09-12 01:00:14 -04:00
Brian Smith 35b2c95131 prevent event handlers from executing multiple times after a session refresh 2013-09-12 00:36:07 -04:00
Brian Smith c38344e8e0 VRFS-662 voice chat settings bug after clicking Cancel 2013-09-12 00:04:51 -04:00
jam 79c37f5434 Add missing group id to list 2013-09-11 17:29:32 -05:00
Jonathon Wilson 9ac705080e vrfs-634. FTUE with no voice chat lets the back-end know this configuration. 2013-09-10 21:06:24 -06:00
Ubuntu a5fdce36d5 fix for fb error 2013-09-10 06:33:23 +00:00
Ubuntu 012e6f234b VRFS 585 2013-09-10 06:27:57 +00:00
Ubuntu 141b39eda3 VRFS584 2013-09-10 06:24:11 +00:00
Ubuntu 0140ba67cb fix for VFRS 582 2013-09-10 06:14:23 +00:00
Ubuntu 7e06c9c83d removing the FB button on createSession 2013-09-10 05:34:46 +00:00
Brian Smith dd42539eef Merge branch 'master' of bitbucket.org:jamkazam/jam-web 2013-09-09 23:44:15 -04:00
Brian Smith 3ee669a488 added logging 2013-09-09 23:44:02 -04:00
Brian Smith 8c5d446bf9 VRFS-568 fix bug with genre list being repeated in dropdown 2013-09-09 23:43:51 -04:00