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

360 Commits

Author SHA1 Message Date
Seth Call c9438fcf99 * feed shows items. no scrolling, no support for query modification yet 2014-03-11 06:09:44 +00:00
Seth Call a2061ff830 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-10 15:24:55 +00:00
Seth Call c9625a4529 * VRFS-1377 done, tested. going to manually test soon on production 2014-03-10 15:21:21 +00:00
Scott Comer 84011ce339 remove bogus reference to non-existent GeoIpIsp 2014-03-10 07:26:15 -05:00
Seth Call 7df02c0778 * merging manifest 2014-03-10 07:13:01 +00:00
Scott Comer 8072096427 fix problem where jam_isp importer deleted contents of geoiplocations instead of geoipisp. 2014-03-10 01:45:32 -05:00
Seth Call b9ee475db5 * working on event page 2014-03-10 06:31:20 +00:00
Seth Call 3c5a14312a * Event page 'chrome' is setup and pulling from database--now to add band logic 2014-03-09 22:58:57 +00:00
Brian Smith 959320f909 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-09 18:56:24 -04:00
Brian Smith dbed2edee8 VRFS-1397 ensure instruments are always synced in music_sessions_user_history table 2014-03-09 18:56:08 -04:00
Scott Comer bf86b9b30b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-09 17:35:29 -05:00
Scott Comer af748cba75 rake tasks for importing geoip data 2014-03-09 17:35:12 -05:00
Seth Call 23e5906e55 * VRFS-1253 - account for unknowns 2014-03-09 19:35:42 +00:00
Brian Smith e250b0f175 do not send band session join notification to band members 2014-03-09 14:44:06 -04:00
Scott Comer c1bea4ae03 merge conflict 2014-03-09 01:28:41 -06: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
Jonathan Kolyer 713344a7a7 merge conflict 2014-03-08 20:50:51 +00:00
Seth Call 5a51bae5fd * set server_id to be same as hostname 2014-03-07 15:03:44 -06:00
Seth Call 755cd0172e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-07 14:20:43 -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
Brian Smith b0525231ab fix test 2014-03-07 15:17:05 -05:00
Jonathan Kolyer eb98b97cd5 merge conflict 2014-03-07 06:53:35 +00:00
Brian Smith 667c629c27 VRFS-1052 fix timestamp issue with notifications (moved to timeago plugin) 2014-03-07 01:30:23 -05:00
Brian Smith 49269443da VRFS-1243 VRFS-1310 fix join session notifications based on access level and user type 2014-03-07 00:38:10 -05:00
Seth Call a3289c5d4c * VRFS-900 - guard against 0 tracks 2014-03-06 11:56:15 -06:00
Seth Call 0d27a47b42 * VRFS-1308 - make configure tracks be cool about no selected items when the user indicates they might want to configure them. fix some recording styling button issues 2014-03-06 11:02:50 -06:00
Scott Comer 2effc50f17 oops, use current_scores not scores 2014-03-05 23:00:57 -06:00
Scott Comer 20cd9e5dd0 added stuff to support getting the max_score attribute to client via json 2014-03-05 22:26:17 -06:00
Scott Comer b54e7d1ca1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-05 20:30:54 -06:00
Scott Comer 65b0c7115a first take on api_music_sessions_controller#index replacement, nindex. 2014-03-05 20:30:40 -06:00
Seth Call 1c2585ba92 * VRFS-1047 mosttly done, aside from jamfet link 2014-03-05 17:18:53 -06:00
Seth Call 302341360e * VRFS-1349 - fixed 2014-03-05 09:35:43 -06:00
Jonathan Kolyer 1eb4b80482 VRFS-1333 refactoring {recording,music_sessions_history}_plays into playable_plays 2014-03-05 06:40:04 +00: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
Jonathan Kolyer 7a991a8032 VRFS-1326 added includes(:latest) to PromoLatest.active impl 2014-03-04 08:17:56 +00:00
Jonathan Kolyer fa3ca94e53 VRFS-1326 added filter for deleted sessions/recordings 2014-03-04 08:14:38 +00: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 17088d49b5 VRFS-1326 fixed integration of latest/buzz 2014-03-04 05:38:58 +00: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 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
Scott Comer 284cbeefc4 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-01 23:37:00 -06:00
Scott Comer a64ab23c97 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-01 20:37:15 -06:00
Scott Comer 5d899f57dd complete unit tests for api_scoring_controller and add some better test data 2014-03-01 20:36:51 -06:00
Brian Smith 37745101e2 add comment explaining sort 2014-03-01 21:35:11 -05:00
Seth Call b7a1e06889 * working on generic recording widget logic 2014-02-28 19:28:17 +00:00
Seth Call fd584967f2 Merge branch 'develop' oft sta bitbucket.org:jamkazam/jam-cloud into develop 2014-02-27 18:38:12 +00:00
Seth Call aaef11add4 * VRFS-1047 - broadcasts can be listened to (but very raw). VRFS-1257 - adding back in listen_in page for admin only 2014-02-27 18:38:02 +00:00
Scott Comer fd42fc56fe wire up get_work 2014-02-27 10:42:47 -06:00