seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
7,876 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

233 Commits

Author SHA1 Message Date
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
Seth Call 732fd66f0e * all tests pass; but need to now rename music session tables to match class names... 2014-05-06 16:17:26 -05:00
Seth Call f3d39a351d * wip 2014-05-06 08:34:38 -05:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Seth Call 15936855e9 * fixing yet another bug associated with websockets and reconnect 2014-05-03 08:50:06 -05:00
Seth Call 30b3098244 * don't null user on context; it should always be non-null 2014-05-02 19:07:10 -05:00
Scott Comer 5cc515d615 a small cleanup of connection fields and fix broken tests 2014-05-02 13:44:29 -05:00
Seth Call 14d6904162 * fixing another bug where .reconnect is not supplied the correct arguments 2014-05-02 07:39:09 -05:00
Seth Call 53850a716b * fixing bad ref to user_id in client cleanup code 2014-05-02 07:33:41 -05:00
Seth Call c0ce26c602 * fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup) 2014-05-01 14:09:33 -05:00
Seth Call ad266e5b80 * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup) 2014-04-30 15:29:10 -05:00
Seth Call 9820562892 * more websocket/heartbeat fixes 2014-04-30 03:01:28 +00:00
Seth Call 3e2f39cc85 * VRFS-1653 - don't bother with cleanup in onerror, and make startup of EventMachine better (VRFS-1659) 2014-04-29 16:27:50 +00:00
Seth Call ece5ee80f8 * debugging websocket-gateway problems 2014-04-29 14:22:31 +00:00
Seth Call 8262725aae * merging in some gateway fixes 2014-04-29 14:19:42 +00:00
Seth Call 76e63193ca * fixing some broken tests 2014-04-09 21:11:13 +00:00
Seth Call cc7bbf3f6a * resolved merge 2014-04-09 18:31:40 +01:00
Seth Call 95f1a59851 * VRFS-1404 reconnect with tests 2014-04-09 18:25:52 +01:00
Jonathan Kolyer e59d9cbe7a VRFS-1483 email error handling 2014-04-05 18:52:12 +00:00
Seth Call 53a6941ceb * VRFS-1473 - Notification Highlighter - make obvious to user that they have new notifications complete 
* VRFS-1523 - USER: Make "enter" key send message in new user-to-user messaging feature
 2014-03-27 18:43:15 +00:00
Seth Call 526f6fe577 * VRFS-1473 - notifications should be highlighted, wip 2014-03-26 17:09:48 +00:00
Scott Comer f7ffa2d7a9 fix problem with missing client_type in login tests 2014-03-17 11:47:27 -05:00
Seth Call f9439bd42e * fixing websocket tests 2014-03-14 17:02:38 +00:00
Scott Comer f8e06c476d fixed and normalized data types and nullability in max_mind_geo and max_mind_isp; fixed rakes for same to use ruby csv instead of pg; dropped the huge maxmind data files i committed earlier; fixed lack of genre in websocket factories.rb constructed music sessions. 2014-03-09 00:22:51 -06:00
Seth Call faed48271b * VRFS-1372 resolved, and not requiring local only until figure out some deployment issues 2014-03-07 14:20:34 -06:00
Scott Comer 87b6654f28 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 18:48:42 -06:00
Scott Comer 057a2b79dd removed updating with with connection location attributes 2014-03-04 18:48:29 -06:00
Seth Call 5f67ad3290 * make rabbitmq_host and rabbitmq_port configurable for websocket-gateway 2014-03-04 15:51:49 -06:00
Seth Call 3c4f5c7e55 * merged 2014-03-03 16:18:03 -06:00
Seth Call 7ab7bfd795 * VRFS-1297, VRFS-1305, VRFS-293, VRFS-950, VRFS-641 - track changes added to help frontend better understand when it needs to poke backend, and refresh state 2014-03-03 16:13:23 -06:00
Scott Comer ab1143c9a8 fix and test user updates upon login 2014-03-03 14:31:25 -06:00
Scott Comer 1e8d2bb724 update user with connection address on login or reconnect; make the better test data useable; fix up tests for geo stuff 2014-03-02 23:16:48 -06:00
Seth Call 7a820e7827 * VRFS-726 - don't care if ftue has succeeded before; we care if there are any good devices 2014-03-01 08:58:42 -06:00
Seth Call 51f955fc74 * VRFS-1047 - broadcast widget almost fully done 2014-02-28 00:24:55 +00:00
Scott Comer 57d2dff00b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-22 22:00:44 -06:00
Scott Comer 74fc2f1b48 data model for jamisp table 2014-02-22 22:00:32 -06:00
Seth Call f2e97625b4 * VRFS-729 - reset FTUE after Add new audio gear selected 2014-02-22 17:34:17 +00:00
Seth Call 5c9a75b466 * pending out the one broken websocket test. 2014-02-22 15:27:04 +00:00
Seth Call 6c106989a6 * fixing websokcet test 2014-02-22 06:53:05 +00:00
Scott Comer d61522491f fixed problem with not null violation in connection construction in factory 2014-02-21 23:48:47 -06:00
Scott Comer 4a9330523c *** scoring schema migration 2014-02-21 22:21:31 -06:00
Seth Call 8483239054 * pg_migrate bump to 0.1.13 with relaxed thor version 2014-02-18 03:42:42 +00:00
Seth Call 9e561c047a * VRFS-1103 - coverage for all projects. need to figure out how to merge all 2014-02-13 22:11:30 -06:00
Seth Call f86d7fbdd5 * deal with chuid differently so pre-script works 2014-02-05 02:13:41 +00:00
Seth Call 103954cb96 * VRFS-1074 - create run folders for pids on every upstart start 2014-02-04 18:18:15 +00:00
Seth Call 513fb2b8d4 * intsall to vendor/bundle 2014-02-02 14:03:31 -06:00
Seth Call b256182cc6 * VRFS-1055 and VRFS-1056 - fixing tests that hardcode / instead of /client, and updating pg gem to 17.1 from 15.1 2014-02-02 13:34:53 -06:00
Seth Call 6806d6f0d3 * VRFS-1016 2014-01-31 14:25:17 -06:00
Seth Call 6ccfc4cc08 * VRFS-1010 possibly done 2014-01-30 15:51:05 -06:00
Seth Call 8f5a2a6369 * tell NOKOGIRI to use system libraries in build environment 2014-01-26 14:46:11 -06:00
Seth Call a26b93a54b * adding requires bugsnag in needed locations to fix VRFS-1023- jam-web won't start 2014-01-25 17:48:17 -06:00
Seth Call f91fb27d64 * fixing websocket-gateway tests by not deleting icecast server groups table 2014-01-21 16:59:29 +00:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Seth Call 1f37b9881f * parameterizing email configs and trying to speed up build on server 2014-01-14 16:55:34 -06:00
Seth Call 1f31bb3ff5 * fixing debian postinstall issue 2014-01-14 09:47:30 -06:00
Seth Call 660e452996 * fixing weboscket gateway problem ;it's pulling in a very old version of actionpack due to some gemfile issue 2014-01-12 04:28:07 +00:00
Seth Call 72a97198ed * up activerecord in websocket gateway to match web 2014-01-11 19:52:30 +00:00
Seth Call d89ce4c140 * VRFS-801 - almost working on my dev machine 2014-01-11 04:57:07 +00:00
Seth Call 0b723362ae * adding resque to websocket-gateway 2014-01-09 02:53:04 +00:00
Chris Doughty d8cb2c72c4 VRFS-951 Pushing only develop or master branch files as debians 2014-01-05 21:35:22 -06:00
Brian Smith 6dec9a5239 fix tests 2014-01-04 20:25:05 -05:00
Brian Smith 3872898b95 VRFS-933 notification work 2014-01-02 14:57:16 -05:00
Brian Smith 75b9b97c60 fix warning related to ruby- prefix in .ruby-version files 2013-12-27 16:28:28 -05:00
Seth Call c784b9faa0 * fixing websocket tests 2013-12-21 00:17:35 +00:00
Seth Call 8deced77c7 * pinning aws-sdk to 1.29.1 everywhere because the gem released today is broken 2013-12-20 23:44:12 +00:00
Seth Call 242016c38b * VRFS-821 - recordings manager changes 2013-12-20 22:01:51 +00:00
Seth Call 95bc077634 * merging VRFS-813 into develop branch; mostly dealing with configureTracks.js and change from client-first on track state (VRFS-852) 2013-11-16 14:05:23 +00:00
Seth Call 9805775496 * VRFS-813 - done for this feature 2013-11-16 04:35:40 +00:00
Seth Call f4401fc36a * wip 2013-11-05 02:25:03 +00:00
Seth Call db76c34ba5 * VRFS-813 -most all frontend changes needed for start/stop recordings 2013-11-03 14:55:55 -06:00
Jonathan Kolyer b48a298af5 merge conflict 2013-11-03 03:16:14 -06:00
Jonathan Kolyer 6f9f72c9b5 vrfs-774: changing country value from USA to US for max_mind_geo support 2013-11-03 01:49:51 -06:00
Seth Call 2481172acb * VRFS-831 - moving to other machine. can't tell if my mac is being strange atm 2013-11-02 20:54:32 +00:00
Jonathan Kolyer 9f09674d77 vrfs-774: added geokit-rails and postgres_ext for geocoded user searches 2013-10-28 21:44:14 -05:00
Seth Call 550a1ae6df * VRFS-798 - close connection if a heartbeat can not be correlated to a connection, or memory state 2013-10-23 15:46:30 +00:00
Seth Call ed2303b916 * VRFS-790; removing database cleaner before every test to fix alter table collisions, as well as speed up tests 2013-10-21 11:13:00 -05:00
Jonathan Kolyer 360b68afc5 vrfs-492: updated stale_client to be fault-tolerant when music_session_id is nil 2013-10-15 09:35:30 -05:00
Seth Call ba0e600293 * VRFS-699; adding bugsnag to websocket-gateway as well, and hook up EventMachine errors in jam-web 2013-09-21 20:43:40 +00:00
Seth Call 17fade7bf0 * VRFS-694; adding newrelic to websocket. only real thing we get here is database monitoring 2013-09-18 22:11:32 +00:00
Seth Call 0006e81301 * missed websockets-gateway when bumping to 0.1 for gem 2013-09-18 21:10:08 +00:00
Seth Call b4082c88ae * bumping gems to be version 0.1.X to match debs 2013-09-18 20:35:20 +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 85cac2a014 * fixing more path changes 2013-09-16 02:36:21 +00:00
Seth Call 4d723bacaf * fixing relative paths in gems for develop branch as well 2013-09-16 02:28:44 +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