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

313 Commits

Author SHA1 Message Date
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