Commit Graph

3085 Commits

Author SHA1 Message Date
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 314d3c9dac * supporting session widget in rich client 2014-03-04 12:22:42 -06:00
Seth Call 3afdd55a15 * fix IE auth issues (and other browsers)... chehck if session is over between every retry play attempt 2014-03-04 11:56:42 -06:00
Seth Call f5f16e9b91 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 11:08:05 -06:00
Seth Call 7d0ca26bda * restrict not null 2014-03-04 11:06:53 -06:00
scott comer f0a0f9f2f2 the real deal geoipdata 2014-03-04 10:41:00 -06:00
Seth Call 81d3a0a540 * make remote show track when loaded in-session 2014-03-04 09:14:16 -06:00
Jonathan Kolyer 7a991a8032 VRFS-1326 added includes(:latest) to PromoLatest.active impl 2014-03-04 08:17:56 +00:00
Jonathan Kolyer b4c168c12a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 08:14:46 +00:00
Jonathan Kolyer fa3ca94e53 VRFS-1326 added filter for deleted sessions/recordings 2014-03-04 08:14:38 +00:00
Seth Call e09b563737 * clean up lowercase k's in emails: VRFS-732 2014-03-04 01:09:13 -06:00
Seth Call 64d77d4ebb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 00:59:31 -06:00
Seth Call 44be38f2b0 * VRFS-1280 - allow people to listen to public widgets without being logged in by allowing music session show API public access 2014-03-04 00:58:40 -06:00
Brian Smith 33500fa385 fixed bugs with showing valid/invalid profiles on account and account audio screens 2014-03-04 01:52:13 -05:00
Brian Smith ba31848626 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 01:44:41 -05:00
Brian Smith 0f9603f0e8 VRFS-1232 added testimonials 2014-03-04 01:44:32 -05:00
Jonathan Kolyer 956f2cf9e9 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 06:23:34 +00:00
Jonathan Kolyer 82722d2cbc VRFS-756 broken test fix 2014-03-04 06:23:29 +00:00
Brian Smith 171a2371a7 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 01:03:39 -05:00
Brian Smith 78560a71a1 VRFS-1287 unbind click each time notification is rendered 2014-03-04 01:03:26 -05:00
Seth Call 7fda82ec0b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 00:00:51 -06:00
Seth Call 5285078cf6 * VRFS-1285 - hide play button if it can't be played, and show BROADCASTING OFFLINE or PRIVATE SESSION appropriaely 2014-03-04 00:00:01 -06:00
Jonathan Kolyer 490b8ad06c VRFS-1326 added Latest ID column 2014-03-04 05:47:32 +00:00
Jonathan Kolyer ff673e97d8 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-04 05:39:09 +00:00
Jonathan Kolyer 17088d49b5 VRFS-1326 fixed integration of latest/buzz 2014-03-04 05:38:58 +00:00
Seth Call 9b8caedbb2 * VRFS-1309 - Edit link erroneously shown on non-you profiles 2014-03-03 23:34:00 -06:00
Seth Call 90f18a671a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-03 23:33:22 -06:00
Seth Call e01491aa86 * VRFS-1330 - load recordings again 2014-03-03 23:11:54 -06:00
Brian Smith e2cae90fa3 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-03 22:35:48 -05:00
Brian Smith 407ab1d4dc VRFS-1327 ensure genres is not empty 2014-03-03 22:35:35 -05:00
Seth Call ddcbcbdd9e * Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-03 21:07:23 -06:00
Seth Call 608f4b2b13 * VRFS-1323 - protect against null entries 2014-03-03 20:45:24 -06:00
Scott Comer 7d8cb8c458 fix missing better test data and bug in connection_manager.rb relating to line 111 2014-03-03 20:30:34 -06:00
Brian Smith e53dcc722f fix JS error in error handler 2014-03-03 19:15:29 -05:00
Seth Call aa62cc7d2a * deal with extremes by squelching to values VRFS-1319 2014-03-03 18:09:27 -06:00
Seth Call 535a0da880 * oops. messed up manifest 2014-03-03 16:53:04 -06:00
Seth Call f0a9b90583 * VRFS-293 - connection status indicators hooked up 2014-03-03 16:49:53 -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 6ee68e8943 fix the login test for locidispid and add a test for reconnect 2014-03-03 14:54:07 -06:00
Scott Comer ab1143c9a8 fix and test user updates upon login 2014-03-03 14:31:25 -06:00
Scott Comer 8c65c272ec Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-02 23:17:05 -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
Jonathan Kolyer 848430ef05 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-03 00:51:36 +00:00
Jonathan Kolyer f760fa1795 VRFS-756 fixed broken tests 2014-03-03 00:51:06 +00:00
Jonathan Kolyer 0b7e860bd1 VRFS-756 removed extranous args from ajaxError 2014-03-03 00:50:32 +00:00
Brian Smith 19f011a3c8 fix syntax errors 2014-03-02 17:10:12 -05:00
Brian Smith 4e032f583d expose new JS bridge methods 2014-03-02 17:09:02 -05:00