Commit Graph

5177 Commits

Author SHA1 Message Date
Seth Call 36b4179492 * VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only) 2015-03-20 17:26:56 -05:00
Seth Call 49368e2e66 Merge branch 'hotfix/recording_fix' into develop 2015-03-20 11:26:50 -05:00
Seth Call d44236abc4 remove jamblaster notice from site 2015-03-20 09:58:58 -05:00
Seth Call 6df6165bb7 remove jamblaster notice from site 2015-03-20 09:55:35 -05:00
Seth Call 301b365044 * VRFS-2968 - escape strings passed to JamTrack builder 2015-03-20 09:44:25 -05:00
Seth Call 10f25be8c4 * replace old style of volume changes VRFS-2964 2015-03-20 08:53:34 -05:00
Seth Call 6032d91725 Merge branch 'master' into develop 2015-03-20 08:50:04 -05:00
Jonathan Kolyer cba86f4db4 VRFS-2916 added totals; limit month range to 1; filled out all unpopulated cols with 0; misc tweaks 2015-03-20 08:06:02 +00:00
Jonathan Kolyer 5621f227b8 VRFS-2916 formatting, added jam_track_played placeholders 2015-03-19 06:07:43 +00:00
Seth Call cfd80927f9 * fix broken tests that occurred when removing mount_uploader from jam_track_track 2015-03-17 13:39:21 -05:00
Seth Call bb35535262 * VRFS-2941 - fix meddling of mount_uplaoder with existing URS 2015-03-17 10:55:16 -05:00
Seth Call 5269520924 * fix bug in earliest cohort code 2015-03-17 10:36:41 -05:00
Jonathan Kolyer 188274cbb5 merging feature/cohort_data with develop 2015-03-17 05:33:01 +00:00
Jonathan Kolyer a577a6e43e VRFS-2916 monthly tweaking 2015-03-17 05:31:04 +00:00
Jonathan Kolyer 4a0aa25785 VRFS-2916 monthly filter 2015-03-17 05:04:13 +00:00
Jonathan Kolyer 5ee4784417 VRFS-2916 admin index 2015-03-17 01:34:04 +00:00
Seth Call ab72438a3f * VRFS-2932 - make preview apply to all jam track tracks 2015-03-16 17:50:38 -05:00
Seth Call b4d581dbc1 * VRFS-2936 - ugly button for Peter testing 2015-03-16 16:04:44 -05:00
Seth Call c2abab8982 * VRFS-2936 - ugly button for Peter testing 2015-03-16 16:04:29 -05:00
Seth Call 9dd3984d07 * VRFS-2936 - ugly button for Peter testing 2015-03-16 13:36:02 -05:00
Jonathan Kolyer 420c00e3b5 VRFS-2916 fixed monthly queries 2015-03-16 06:03:36 +00:00
Jonathan Kolyer 087ec9b1e0 VRFS-2916 online play query 2015-03-14 21:24:01 +00:00
Jonathan Kolyer eff4453482 VRFS-2916 monthly queries 2015-03-14 20:53:03 +00:00
Seth Call e82da2161d * VRFS-2927 - mute both master/personal for own tracks 2015-03-14 15:00:11 -05:00
Jonathan Kolyer caddee4f57 merging develop 2015-03-14 18:41:22 +00:00
Jonathan Kolyer 961af94e6c VRFS-2795 cohorts first pass 2015-03-14 18:39:07 +00:00
Seth Call b0aac73732 * VRFS-2924 - show visual metronome option 2015-03-13 10:44:24 -05:00
Seth Call 3c62d61aed * bump for build 2015-03-13 09:12:52 -05:00
Jonathan Kolyer b38370589f VRFS-2916 cohort model/table 2015-03-13 07:10:39 +00:00
Seth Call 7c73e2ab5c * VRFS-2922 - show spinner for pending metronome 2015-03-12 21:53:23 -05:00
Seth Call 5fa37abfb3 * VRFS-2916 - adding redeemed boolean 2015-03-11 17:02:03 -05:00
Seth Call 477df086b0 Revert "* VRFS-2913 - allow /client to be accessed without being logged in"
This reverts commit 0a869e91e3.
2015-03-11 16:53:12 -05:00
Seth Call 0a869e91e3 * VRFS-2913 - allow /client to be accessed without being logged in 2015-03-11 16:44:22 -05:00
Seth Call 6c82e00d00 * VRFS-2876 cleaning up preview downloadability in jam-admin 2015-03-11 09:20:45 -05:00
Seth Call 9279d88d8d * VRFS-2876 - pro licensing added and 20 second snippet 2015-03-10 22:10:22 -05:00
Seth Call 882f2267cf * fixing urls getting messed with my mount uploader 2015-03-09 16:35:39 -05:00
Seth Call 28ebbe893c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-03-09 09:49:21 -05:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Brian Smith fb3ed71957 VRFS-2854 more session widget feed fixes 2015-03-06 23:18:29 -05:00
Seth Call be97555f1a * VRFS-2885 - check mixers from both modes 2015-03-05 09:47:33 -06:00
Brian Smith 6fa59bf76f VRFS-2854 fixed bug with hovering over private sessions in feed 2015-03-05 02:18:05 -05:00
Steven Miers 07f688fc91 Fix test: make rabl file match controller action name. 2015-03-04 17:27:43 -06:00
Steven Miers c6497c8457 Kill puts. 2015-03-04 16:31:03 -06:00
Steven Miers 003b06cae0 VRFS-2782 : Fix error found by test. 2015-03-04 16:14:26 -06:00
Steven Miers a34031728e Cleanup 2015-03-04 16:14:01 -06:00
Steven Miers ead2921e84 VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result. 2015-03-04 16:13:58 -06:00
Steven Miers f935b8c7e9 VRFS-2782 : Multiple bitrates in admin UI. 2015-03-04 16:13:54 -06:00
Steven Miers d526f98367 VRFS-2782 : Add a jam tracks builder spec to more directly exercise building, in addition to specific tests for 48kHz vs 44kHz 2015-03-04 16:13:45 -06:00
Steven Miers ff6848430f Merge 2015-03-04 16:13:36 -06:00
Steven Miers 63c45e0a6e VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders. 2015-03-04 16:03:57 -06:00