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

367 Commits

Author SHA1 Message Date
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
Brian Smith 09899e8f0a VRFS-1247 include Listen link in session emails 2014-02-27 00:00:01 -05:00
Brian Smith ca20570a16 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-26 20:56:33 -05:00
Seth Call 7c99c44eaf Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-27 00:38:06 +00:00
Seth Call f0e916e736 * VRFS-1047 - looks good; no audio hooked up 2014-02-27 00:38:01 +00:00
Scott Comer 2a66b1ec6d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 23:02:06 -06:00
Scott Comer d12e65549d wire up api/scoring/record 2014-02-25 23:01:55 -06:00
Brian Smith ee0a25293d VRFS-1235 de-dup tracks on recording hover 2014-02-25 22:04:19 -05:00
Brian Smith 2794a03993 VRFS-1231 de-dup instruments for the same musician 2014-02-25 20:36:45 -05:00
Seth Call 45c61ad038 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 19:27:47 +00:00
Seth Call 7a41b74549 * VRFS-1228 2014-02-25 19:22:32 +00:00
Scott Comer 4e24b51fe9 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 08:32:13 -06:00
Brian Smith 1322f72e64 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 07:23:10 -05:00
Scott Comer 2163e0172f Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 06:17:58 -06:00
Seth Call 686a0980e6 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 05:41:47 +00:00
Seth Call 7753a2d4b3 * VRFS-1228 - can add, but not update ,user biography 2014-02-25 05:41:43 +00:00
Brian Smith e9e57c71de Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 00:37:13 -05:00
Brian Smith a873ab29e7 VRFS-1231 fix user/track display on landing pages 2014-02-25 00:36:53 -05:00
Jonathan Kolyer b36e87e29f VRFS-733 disabled validation fail when sessions exist until tests can pass 2014-02-25 04:25:22 +00:00
Scott Comer 8d72f48915 get_work data model 2014-02-24 21:50:58 -06:00
Jonathan Kolyer 9d3ee833a1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-25 03:29:38 +00:00
Scott Comer b33206683b merged updates 2014-02-24 15:22:26 -06:00
Scott Comer f69cdc3b4d fix problem with locidispid being int instead of bigint; add scores; flush use of prepared statements for geoip stuff; implement connection manager update of connection and user records with location information 2014-02-24 15:19:46 -06:00
Seth Call e4718652fd * merging 2014-02-24 16:57:01 +00:00
Seth Call 0522c20e60 * VRFS-1100 - can only download 100 times before 404 given for client downloads, VRFS-862 - quick change to unblock 2014-02-24 16:55:56 +00:00
Brian Smith 31c7cf7b45 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-24 01:10:20 -05:00
Jonathan Kolyer fe5163b1fb added active class accessor 2014-02-24 04:24:13 +00:00
Scott Comer 7de74f89af Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-23 21:42:23 -06:00
Brian Smith 69b4342731 remove puts statements 2014-02-23 21:04:02 -05:00
Jonathan Kolyer 4b91f4493c VRFS-773 added validation check to ensure users cannot connect to multiple music sessions unless they are admin 2014-02-24 01:46:38 +00:00
Scott Comer 810b5e7911 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-23 17:24:40 -06:00
Scott Comer 04dab677f9 model for geoiplocations 2014-02-23 17:24:25 -06:00
Brian Smith 83b4260b91 VRFS-759 VRFS-1221 delete session notifications when session ends in db and sidebar, fix listen button for sessions and recordings 2014-02-23 15:47:53 -05:00
Brian Smith 0a2da28ae4 VRFS-1215 must call deliver to send emails 2014-02-23 14:08:28 -05:00
Scott Comer b0dfa5501f data model for geoipblocks 2014-02-22 23:39:20 -06:00
Scott Comer 74fc2f1b48 data model for jamisp table 2014-02-22 22:00:32 -06:00
Seth Call dae0f40929 * removed is_downloadable for VRFS-1141, from database and UI 
* what's next dialog has icheck-styled checkbox now VRFS-913
* facebook invitations hooked up for VRFS-1121
 2014-02-22 05:09:39 +00:00
Brian Smith 73dce2906d fix issue with recording url construction 2014-02-20 21:02:41 -05:00
Seth Call f3c09f65c2 * allowing tests to be skipped, and mostly done with VRFS-1200 2014-02-20 22:23:44 +00:00
Seth Call aab902e8cf * VRFS-1160 - favorites REST API done 2014-02-20 20:54:35 +00:00
Seth Call 061c74f8c6 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 16:28:45 +00:00
Seth Call f353c04900 * VRFS-1135 - add unique_user_histories to MusicUserHistory, and render that in feed 2014-02-20 16:20:20 +00:00
Jonathan Kolyer e0ae2e378e VRFS-1194 changed recording/session drop-down list selection to unique ID text input 2014-02-20 10:01:25 -06:00
Seth Call db15c37a53 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 08:03:02 +00:00
Seth Call df14676495 * VRFS-1135 - user and band targetting possible 2014-02-20 07:45:51 +00:00
Daniel Weigh 069e9c8297 VRFS-1135 allow empty string to be passed in to start parameter 
(due to jQuery not stripping null / empty params and refactor)
 2014-02-20 00:29:28 -05:00
Brian Smith 85f8bf6cad Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-19 22:48:47 -05:00
Brian Smith 956ff422f4 fix sidebar for recordings 2014-02-19 22:48:34 -05:00
Seth Call 3efb3fc5ab * feed test fixes 2014-02-20 03:23:38 +00:00
Seth Call 455ddecaaa Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-20 02:28:31 +00:00
Seth Call 6aae1ef0e6 * VRFS-1135 add time filters and type filter 2014-02-20 02:22:41 +00:00
Brian Smith c95a650cdc add POST button to landing pages for comments, add like_count back to session model 2014-02-19 20:31:44 -05:00
Brian Smith f388f1c7e2 add likes and play count back to model...not sure how it got deleted 2014-02-19 20:06:40 -05:00
Seth Call 857dd27404 * VRFS-1191, VRFS-1120, VRFS-1079, VRFS-1087, VRFS-1190, VRFS-1192--many band page changes, fixes. small fix for notification icons showing orange circle if icon_url not specified 2014-02-19 22:56:13 +00:00
Brian Smith fb1adc488f VRFS-1184 fix join 2014-02-19 00:14:00 -05:00
Seth Call ec0eb4bb2a * VRFS-1140 2014-02-18 20:12:50 +00:00
Seth Call 7449de7aad * fix test bugs, get VRFS-1135 sorts resolved, and fix for easydropdown not destroying topmost div 2014-02-18 18:53:16 +00:00
Seth Call e33e3a519f * fix url problem with tracks 2014-02-18 15:35:47 +00:00
Seth Call de294d19bb * VRFS-1135; music session history has creator, participants, and band info now. 2014-02-18 14:24:32 +00:00
Seth Call 4808514032 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 13:35:11 +00:00
Seth Call 222bf23cc5 * VRFS-1135 sorts added to model; need to change next behavior to come from model, not controller 2014-02-18 13:34:51 +00:00
Jonathan Kolyer 3b8e564495 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-18 01:27:40 -06:00
Daniel Weigh b919dbadd8 VRFS-1136 - fix / tweak infinite scroll 
on band and musicians page.
 2014-02-18 02:09:31 -05:00
Jonathan Kolyer b822711f1d Merge branch 'develop' into vrfs1110 2014-02-18 00:13:26 -06:00
Jonathan Kolyer 0b9eec4823 fixed broken tests again 2014-02-18 00:12:47 -06:00
Jonathan Kolyer cba678616f fixed broken test from refactoring of followers 2014-02-17 23:38:35 -06:00
Seth Call d6149a3908 * pin rails to 3.x 2014-02-18 04:54:33 +00: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 b9e20ba446 * moving recording_plays to where it belongs 2014-02-17 23:56:17 +00:00
Seth Call 51d446ab62 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-02-17 23:26:58 +00:00
Seth Call 5654f27b55 * merged 2014-02-17 23:26:17 +00:00
Seth Call 0218ca5ad6 * urls fixed for VRFS-1148 2014-02-17 19:12:52 +00:00
Seth Call 5ae2a769b5 * fix mix regressions due to addition of MixUploader 2014-02-17 03:56:42 +00:00
Seth Call 134974af61 * fix issue 2014-02-17 02:52:00 +00:00
Seth Call ff6b3795ce * merged 2014-02-17 00:32:51 +00:00
Seth Call 5ef630cf86 * in progress on next parameter VRFS-1135 2014-02-17 00:30:08 +00:00
Brian Smith 348f96f5b0 fix bugs 2014-02-16 17:39:26 -05:00
Brian Smith 83f347e84c merge like/follow refactor and hover bubble work 2014-02-16 16:03:32 -05:00
Brian Smith ebc49b6ccc VRFS-1028 more refactor work 2014-02-16 14:48:54 -05:00
Brian Smith a1828cd93d trying to fix tests 2014-02-16 13:06:36 -05:00
Seth Call 8cfe032dc2 * adding error info to debug VRFS-1140 and pagination in progress on VRFS-1135 2014-02-16 14:04:24 +00:00
Brian Smith 5ba98b93ab fixing tests in progress 2014-02-16 08:40:03 -05:00
Seth Call f7d0ef2b05 * VRFS-1135 only one recording comes back; not per claimed recording 2014-02-16 13:10:00 +00:00
Jonathan Kolyer 4dd15d1146 Merge branch 'develop' into vrfs1110 2014-02-16 02:32:53 -06:00
Jonathan Kolyer cddf9a5013 added active_latests convenience method 2014-02-16 02:31:44 -06:00
Jonathan Kolyer 37025a68d7 VRFS-1110 changed param name; added api request support 2014-02-16 01:28:39 -06:00
Brian Smith 36287d0b5f VRFS-1028 hover bubble / like and follow refactor 2014-02-16 02:28:35 -05:00
Jonathan Kolyer b0dcb4a934 VRFS-1110 add autocomplete tests 2014-02-16 00:17:56 -06:00
Brian Smith c173582aa3 more work on like/follow refactor 2014-02-15 20:24:51 -05:00
Brian Smith c03404d520 like/follow refactor 2014-02-15 18:23:00 -05:00
Seth Call 26a8b8013d * VRFS-1135 - initial implementation with no ways to control the returned results. it just returns most recent to oldest now, with a max of 20 2014-02-15 21:19:03 +00:00
Brian Smith 5a03ec87ae follow/like refactor to use polymorphic associations 2014-02-15 11:55:01 -05:00
Seth Call 5ba4e97dca * VRFS-1089 - jamadmin creation of recordings done 2014-02-13 16:41:50 +00:00
Seth Call 0f0521ccf8 * VRFS-152-replace localhost with 127.0.0.1, if present 2014-02-11 17:25:03 +00:00