Commit Graph

136 Commits

Author SHA1 Message Date
Seth Call 786486026b * wip 2014-12-30 17:10:16 -06:00
Seth Call 3bac8252e9 * fixing websocket tests 2014-12-18 16:26:56 -06:00
Seth Call d83a632d0b Conflicts:
db/manifest
	web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
Steven Miers b01b3ecd7d VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge. 2014-11-16 16:23:31 -06:00
Seth Call 92b617898f * VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality 2014-11-14 20:47:56 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Seth Call 4f9bdb2c5c * VRFS-2404 There are cases where a session can incorrectly get stuck in a 'I'm still recording' state 2014-11-03 15:24:46 -06:00
Seth Call dac2910008 * VRFS-2400 - show retry button only in the correct conditions
* VRFS-2425 - make sure threads don't die on exception, but report up
2014-10-28 21:16:54 -05:00
Seth Call 993074b136 * pinning back devise 2014-10-06 09:36:55 -05:00
Seth Call 3e8008224e * changing test ports all around for websocket-gateway 2014-09-26 14:09:25 -05:00
Seth Call 74a27e14cf * fix websocket tests 2014-09-26 09:20:35 -05:00
Seth Call 39ed460d14 * VRFS-2280 - fix locations getting invalidated, and VRFS-1806 fixed by detecting no login data 2014-09-25 23:13:34 -05:00
Seth Call f4ef6b2360 * websocket-gateway GATEWAY_NAME fixes 2014-09-25 20:40:31 -05:00
Seth Call 9442e34297 * adding default for connection gateway name 2014-09-24 21:52:07 -05:00
Seth Call cf70cb4109 * remove chatty debug 2014-09-24 21:40:07 -05:00
Seth Call 0b85d00825 * fixing some package issues with websocket-gateway 2014-09-24 20:52:09 -05:00
Seth Call b87ff571ce * VRFS-1073 - support multiple websocket gateways 2014-09-24 14:27:56 -05:00
Seth Call 0b1ba57e1e * remove puts 2014-09-17 10:27:31 -05:00
Seth Call a273808865 * fix reconnect path again 2014-09-17 10:26:58 -05:00
Seth Call 0db38e17d6 * adding tests for VRFS-2221 2014-09-17 10:22:05 -05:00
Seth Call 6b96bdcd05 * VRFS-2221 - fix bad reconnect path 2014-09-17 10:22:00 -05:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Seth Call c35cfcf0f9 * VRFS-2104 make sure APP_CONFIG exists in websocket-gateway 2014-08-31 14:45:48 -05:00
Seth Call 5f85908c79 * VRFS-2104 - client update dialog happens when it needs to; not just on startup 2014-08-31 10:30:59 -05:00
Seth Call 8f49a9ab66 Merge branch 'develop' into feature/latency_hover 2014-08-19 12:49:54 -05:00
Seth Call 27f4adf772 * VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs 2014-08-18 20:41:44 -05:00
Seth Call 0c3a43a177 * wip 2014-08-18 10:37:55 -05:00
Seth Call 30b2c1bb53 * VRFS-2045 - fixing tests that use websocket-gateway, pass in 20 instead of defaulting of 0 for max connections 2014-08-14 13:16:38 -05:00
Seth Call 154e2954d2 * VRFS-2045 - remove debug log 2014-08-14 11:35:51 -05:00
Seth Call 776704fdf5 * VRFS-2045 - guard against too many concurrent connections 2014-08-14 11:35:17 -05:00
Seth Call 0ebdc0ee7c * fixing more time comparisons in tests 2014-07-22 14:57:34 -05:00
Seth Call 333e321877 * updating the last_jam info on user in 5 needed locations (login, registration, ftue, import, etc) 2014-07-22 14:36:45 -05:00
Seth Call 433148cd55 * adding rubyzip to websocket-gateway and admin 2014-07-19 23:05:20 -05:00
Seth Call ca084dc1ec * fixing websocket test 2014-07-14 17:41:42 -05:00
Brian Smith e211871168 merge develop 2014-06-23 01:09:03 -04:00
Seth Call 3d1c4f2488 * VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message 2014-06-19 14:05:33 -05:00
Seth Call 62bf8eb0a0 * allow core dumps and a greater number of handes for the web processes 2014-06-14 13:06:37 -05:00
Seth Call 89cce8c881 * adding some gems to websocket gateway 2014-06-11 10:27:51 -05:00
Seth Call 26f5006bc9 * pinning rspec to compatible version 2014-06-03 16:47:20 -05:00
Seth Call 5752f2d7dd * fixing tests 2014-05-29 15:34:19 -05:00
Seth Call dff3fa4870 *wip 2014-05-29 14:44:37 -05:00
Seth Call e4da30f39e * wip 2014-05-29 14:39:08 -05:00
Seth Call 9b18849544 * working on feature ftue 2014-05-29 14:31:01 -05:00
Anthony Davis 1ce510bb18 VRFS-1705 - 'monitor' subproj initial commit 2014-05-21 16:52:11 -05:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call 57e8860dcb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 14:22:56 -05:00
Anthony Davis 4d4d04b343 VRFS-1651 - test-www should not use build_number 2014-05-07 08:30:41 -05:00
Seth Call 97269133ba Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 08:03:43 -05:00
Anthony Davis 1fa9ffcc3f VRFS-1651 - really no jam_* gems in test-www 2014-05-07 07:40:22 -05:00
Seth Call 7dd1e6c464 * renaming of tables in 2014-05-06 17:50:41 -05:00