d684ecda3b
Merge with latest from develop and manually fix.
2015-05-18 16:02:07 -05:00
Seth Call
f5595a03d5
* actually send email when fraud detected
2015-05-16 10:18:35 -05:00
11f60b71e4
VRFS-3242 : Schema and model changes required for band profile functionality.
...
* Additional attributes for band_type, band_status, concert_count,
add_new_members, play_commitment, touring_option, paid_gigs,
hourly_rate, gig_minimum
* For joined table musician_instruments, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table performance_stamples, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table online_presences, remove the hard requirement that
they be joined to a user, rather a “player” that is polymorphic.
* Change models as appropriate with new attributes and modify
belongs_to / has_many directives as necessary.
* Fix existing usages of user_id to work with polymorphic player_id.
* Fix tests that use user_id
* Add new tests that exercise online_presence, performance_samples, and
instruments that target a band, rather than a user.
2015-05-13 21:06:14 -05:00
294c01d44a
Merge with latest develop
2015-05-11 17:25:37 -05:00
Seth Call
f2aba1e390
* VRFS-3235 - download helper
2015-05-11 11:15:57 -05:00
Seth Call
2495f58bf5
* VRFS-3220 - estimated taxes fixed
2015-05-07 14:48:16 -05:00
Seth Call
96df8cbfea
* disabling teaspoon gemfile for now, because of weird errors; and also VRFS-3176 (jamtrack preview regen task)
2015-05-05 11:44:28 -05:00
Seth Call
4d28915381
* VRFS-3177 - add spinner to playback and stop preloading all media on page
2015-05-04 17:48:14 -05:00
Seth Call
a2d5c0a2b9
* VRFS-3166 - only play one widget at a time
2015-05-04 07:52:30 -05:00
Seth Call
1bd054d050
* VRFS-3094 - update style and minor issues in shopping cart screen
2015-04-27 15:42:38 -05:00
Seth Call
4cce21e7f8
* VRFS-3080 - partial refund manual process done
2015-04-23 16:20:21 -05:00
Seth Call
989518fa68
* VRFS-3082 - email alert if jamtrack fails
2015-04-23 10:34:17 -05:00
Seth Call
091f2be556
* make the nobody@jamkazam.com configurable so that we can override it in chef to provide context clues
2015-04-22 15:43:36 -05:00
Seth Call
e42b926a5e
* VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases
2015-04-10 15:19:08 -05:00
Seth Call
821ca9d76a
* VRFS-2875 - sales record keeping as well as recurly hook processing
2015-04-03 15:34:12 -05:00
Seth Call
f7febfabcf
* VRFS-2999 - create whole track preview for master track on import
...
* VRFS-3000 - create duration for jam track
* VRFS-2996 - create jamtrack preview widget
* VRFS-2870 - individual jam track landing page (still needs tests)
2015-03-31 13:36:49 -05:00
Seth Call
3d43f123b1
* VRFS-2992 -make mp3 as well as ogg preview
2015-03-29 21:51:14 -05:00
Seth Call
4a36bc6982
* VRFS-2988 - relax position duplication constraint
2015-03-26 10:16:14 -05:00
Seth Call
f63c94d9a3
* VRFS-2984 - use alternate syntax for sox trim
2015-03-25 16:05:41 -05:00
Seth Call
53ef0f1b4f
VRFS-2975 - change jam track Id to varchar(64)
2015-03-25 11:11:10 -05:00
Seth Call
bfe302b2f1
* merged
2015-03-24 14:43:48 -05:00
Seth Call
ccd60aa631
* merged develop
2015-03-24 11:27:26 -05:00
8c2df0bb6b
VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting
2015-03-23 20:06:32 +00:00
153d79749c
VRFS-2972 for jam_track_rights, exclude is_test_purchase=true
2015-03-23 07:03:57 +00:00
dd23b38f4e
VRFS-2916 fixed subquery override from block
2015-03-23 04:48:13 +00:00
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
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
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
5621f227b8
VRFS-2916 formatting, added jam_track_played placeholders
2015-03-19 06:07:43 +00: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
188274cbb5
merging feature/cohort_data with develop
2015-03-17 05:33:01 +00:00
a577a6e43e
VRFS-2916 monthly tweaking
2015-03-17 05:31:04 +00:00
4a0aa25785
VRFS-2916 monthly filter
2015-03-17 05:04:13 +00:00
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
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
420c00e3b5
VRFS-2916 fixed monthly queries
2015-03-16 06:03:36 +00:00
087ec9b1e0
VRFS-2916 online play query
2015-03-14 21:24:01 +00:00
eff4453482
VRFS-2916 monthly queries
2015-03-14 20:53:03 +00:00
961af94e6c
VRFS-2795 cohorts first pass
2015-03-14 18:39:07 +00:00
b38370589f
VRFS-2916 cohort model/table
2015-03-13 07:10:39 +00:00
Seth Call
f9e02c5707
Merge branch 'develop' into feature/jam_track_ui_2
...
Conflicts:
admin/app/admin/jam_tracks.rb
admin/app/views/admin/jam_tracks/_form.html.slim
admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
admin/config/initializers/jam_tracks.rb
db/manifest
ruby/lib/jam_ruby.rb
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
ruby/lib/jam_ruby/jam_tracks_manager.rb
ruby/lib/jam_ruby/models/jam_track.rb
ruby/lib/jam_ruby/models/jam_track_right.rb
ruby/lib/jam_ruby/models/jam_track_track.rb
ruby/spec/jam_ruby/models/jam_track_right_spec.rb
ruby/spec/jam_ruby/models/jam_track_track_spec.rb
ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
web/app/assets/javascripts/download_jamtrack.js.coffee
web/app/assets/javascripts/globals.js
web/app/assets/javascripts/jam_rest.js
web/app/assets/javascripts/order.js
web/app/assets/javascripts/playbackControls.js
web/app/assets/javascripts/session.js
web/app/assets/stylesheets/client/session.css.scss
web/app/controllers/api_jam_tracks_controller.rb
web/app/controllers/api_recurly_controller.rb
web/spec/controllers/api_jam_tracks_controller_spec.rb
2015-03-12 08:51:52 -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
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
f935b8c7e9
VRFS-2782 : Multiple bitrates in admin UI.
2015-03-04 16:13:54 -06:00
Seth Call
aba4546e44
Squashed commit of the following:
...
* VRFS-2881 use backend audio source info in metronome
* VRFS-2832 add metronome play controls with mode control
* VRFS-2873 straighten out metronome names in frontend
* VRFS-2782 use getMyNetworkState for ntp_stable determination
* VRFS-2864 allow 'cluster' test, a new metronome mode
* VRFS-2861 metronome sounds not always matching frontend
* VRFS-2852 relax idea that only one person can open metronome
* VRFS-2865 metronome sounds not always matching frontend(dup)
* VRFS-2847 metronome volume now moves master and personal both
* VRFS-2835 metronome 'prevent' message is now dialog, not notify
* VRFS-2833 anyone can control volume/mute of metronome
* VRFS-2850 don't prevent metronome if solo session
2015-03-03 19:06:55 -06:00
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06:00
Seth Call
9415593244
* merged
2015-02-27 08:41:49 -06:00
Steven Miers
Seth Call
Jonathan Kolyer