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,239 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

3239 Commits

Author SHA1 Message Date
Seth Call 030d31eadc supply link on facebook share - VRFS-1376 2014-03-10 16:24:36 +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
Jonathan Kolyer 93a24f0ca8 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-10 11:47:52 +00:00
Jonathan Kolyer 00c45b4612 VRFS-1393 changed FB share image to use square logo-512.png 2014-03-10 11:47:31 +00:00
Seth Call 7df02c0778 * merging manifest 2014-03-10 07:13:01 +00:00
Scott Comer 29d86cc605 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-10 01:45:55 -05: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
Brian Smith 56b9bd07ea Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-10 01:41:26 -04:00
Brian Smith b13dcef4f1 VRFS-1399 media center content 2014-03-10 01:41:06 -04:00
Scott Comer a0fab2b584 mod the get_work stored procedure to exclude all connections but those which are from clients. 2014-03-10 00:17:34 -05: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
Seth Call 5a8c3886fd Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-09 18:05:39 +00:00
Seth Call aa493ecc29 * VRFS-1253 - working in a basic sense with pagination 2014-03-09 18:05:26 +00:00
Seth Call 000dd3fdd0 * VRFS-1253 - working in a basic sense with pagination 2014-03-09 18:04:56 +00: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 5abc877a38 VRFS-709 added calls to GA record/session tracking 2014-03-09 01:16:39 +00:00
Jonathan Kolyer e271feeb70 VRFS-1333 addPlayablePlay integration 2014-03-08 23:59:56 +00:00
Jonathan Kolyer 386fcbd9a3 VRFS-1333 removed add_play; now lives in user/api 2014-03-08 23:56:49 +00:00
Jonathan Kolyer 721840172c VRFS-1333 added plays_refactor.sql 2014-03-08 20:51:12 +00:00
Jonathan Kolyer 713344a7a7 merge conflict 2014-03-08 20:50:51 +00:00
Brian Smith e67b091015 VRFS-600 replace console.debug with console.log (except for tests 2014-03-08 14:52:32 -05:00
Brian Smith dd520ee6e6 VRFS-1382 add new template parameter to Followers section 2014-03-08 14:33:40 -05:00
Brian Smith 1bd8271b03 VRFS-1382 fix band hovers on musician profile Social tab 2014-03-08 14:31:49 -05:00
Brian Smith d312f46ff9 VRFS-600 fix musicians feed display issue in IE11 2014-03-08 14:06:17 -05:00
Brian Smith a5a8575ccf VRFS-1378 scope CONNECT button for main search results page so the sidebar CONNECT button is not invoked twice 2014-03-08 12:49:11 -05:00
Brian Smith 00a447037a VRFS-1287 VRFS-1340 fix issues with weird behavior of Okay and Cancel buttons in notifications 2014-03-08 01:37:25 -05:00
Seth Call eea0001ab3 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-07 20:53:29 -06:00
Seth Call 8d0faa9b81 * adding test method to check 'local' behavior 2014-03-07 20:52:00 -06:00
Brian Smith 9c2b10dd5f VRFS-1243 VRFS-1310 fix regression in session notifications in sidebar 2014-03-07 19:56:27 -05:00
Scott Comer 798ccc4529 fix case where connection_client_type.sql is boggled by existing connections, and added schema for cities, regions, and countries. 2014-03-07 17:23:25 -06:00
Scott Comer d7443edf58 fix case where connection_client_type.sql is boggled by existing connections, and added schema for cities, regions, and countries. 2014-03-07 17:23:04 -06: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 77528ddc9d VRFS-1333 added recordingId 2014-03-07 09:05:34 +00:00
Jonathan Kolyer db3a063bd2 Merge branch 'develop' into vrfs1333 2014-03-07 07:35:31 +00:00
Jonathan Kolyer 38bde04ec7 VRFS-1333 play tracking 2014-03-07 07:35:10 +00:00
Seth Call adb37e06a6 * merged 2014-03-07 01:31:13 -06:00
Seth Call d6b6cb553c * adding data-claimed-recording-id to feed entry, and pass in claimedRecordingId as an option to .listenRecording() in recording landing page, and home page 2014-03-07 01:30:38 -06:00