0f4fb0816e
VRFS-3681 removed files added by bundler
2015-11-08 22:25:59 +00:00
1bcee2e60c
Merge branch 'develop' into feature/mobile
2015-11-01 02:28:10 +00:00
Seth Call
b0c8c88524
* fix display issues with sales
2015-10-28 16:32:55 -05:00
Seth Call
9d8c46ca7c
* sale line items
2015-10-28 08:10:03 -05:00
Seth Call
76e3bb3284
* affilate quarterly payments
2015-10-27 16:21:16 -05:00
1fe20d6c2b
merging develop
2015-10-24 01:58:49 +00:00
Seth Call
f002864a08
* most of VRFS-3674 (detect browser-based fraud) done
2015-10-23 14:42:51 -05:00
8e21fb1fe7
merging develop
2015-10-22 01:00:34 +00:00
Seth Call
27328a7c65
* VRFS-3670 - affiliate rate usage
2015-10-20 21:09:58 -05:00
ffa5fe1798
Merge branch 'develop' into feature/mobile
2015-10-20 00:40:05 +00:00
Seth Call
9dbcdb2436
* help doc tweak
2015-10-19 17:53:50 -05:00
7a2dd6ea0b
VRFS-3459 merging develop
2015-10-19 19:58:41 +00:00
Seth Call
5073c2d4e7
* show daily status
2015-10-19 14:34:06 -05:00
Seth Call
2b81276e1b
* sort by referrals
2015-10-19 14:06:18 -05:00
Seth Call
993e12995c
* track redeem correctly; also try and fix admin
2015-10-19 12:56:52 -05:00
Seth Call
a63f9085f4
* VRFS-3664 - dont say dear anonymous in emails
2015-10-19 10:07:53 -05:00
Seth Call
e7f8e2fed1
* fix nil crash in importer, and make referral page display friendlier
2015-10-18 09:05:24 -05:00
Seth Call
58b8a29f51
* VRFS-3630 - jamtrack landing page revamp
...
* VRFS-3637 - jamtrack landing tile updated
* VRFS-3638 - jamtrack web player
2015-10-16 14:01:18 -05:00
c700f856e5
Merge branch 'develop' into feature/mobile
2015-10-13 17:34:12 +00:00
Seth Call
276442a9b4
* VRFS-3512 - upload videos to youtube
2015-10-07 21:12:26 -05:00
0c25d0e40b
merging develop
2015-10-05 14:06:39 +00:00
Seth Call
9420cebad4
* VRFS-3494 - show popup when video window launches for the 1st time to offer guidance
2015-08-30 05:00:00 -05:00
Seth Call
22ea6e89fd
* VRFS-3488 - jamtrack search by artist and song need to pin to the match, not do a sloppy search
2015-08-26 20:26:39 -05:00
Seth Call
e7b50ca4a8
* VRFS-3449 - updates for direct landing pages
2015-08-20 14:19:07 -05:00
Seth Call
5ba03a2755
* VRFS-3431 - better response when creating HFA request
2015-08-18 20:41:37 -05:00
Seth Call
37d6c3e57c
* add csv to dump released JamTracks
2015-08-18 15:19:40 -05:00
Seth Call
aec3d106fa
* more scopes for onboarding
2015-08-09 17:27:30 -05:00
Seth Call
eba1280708
* make it so it's easy to find jam tracks with problems
2015-08-09 13:57:19 -05:00
Seth Call
af355ec096
* get activeadmin working for JamTracks after onboarding enhancements were added
2015-08-09 13:47:49 -05:00
Seth Call
557e19e5e7
* allow better onboarding of JamTracks including audio from Tency Music (VRFS-3296, VRFS-3386)
2015-08-09 13:37:43 -05:00
Seth Call
55c1d2fb41
* trying to fix transition to 2.2.2
2015-07-16 11:48:17 -05:00
Seth Call
efe3dea8e3
* updating Rails to 3.2.22 to allow compat with ruby 2.2.2
2015-07-16 10:58:03 -05:00
Seth Call
6b70483743
* restoring admin packaging phase, debugging ruby test problem
2015-07-15 12:12:29 -05:00
Seth Call
3b71931e73
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
Seth Call
5c79bdab5c
* make unsubscribed work, and only dump first_name
2015-06-20 14:49:11 -05:00
Seth Call
c5bc95c562
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-06-20 14:04:13 -05:00
Seth Call
53d62f1087
* synchronize jam-admin and jam-web secret token
2015-06-20 14:03:24 -05:00
cfda14e16e
VRFS-3190 : Merge with latest develop branch
2015-06-16 12:23:57 -05:00
Seth Call
6afcc84088
* only list users who have opted into email
2015-06-10 16:41:52 -05:00
Seth Call
622f750b2d
* VRFS-3261 add link to let sendgrid pull our users email info down for emailing out good unsubscribe links
2015-06-10 15:14:15 -05:00
Seth Call
0dbbfc0ee7
* VRFS-2855 - broadcast notifications done
2015-06-10 08:26:45 -05:00
d5a8959677
Merge with develop.
2015-06-03 14:22:21 -05:00
Seth Call
d959a17be4
* affiliate program in place VRFS-3030
2015-05-28 08:20:14 -05:00
Seth Call
c96f0a7859
* VRFS-3260 - fraud check code and admin helpers complete
2015-05-20 09:24:17 -05:00
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
Jonathan Kolyer
Seth Call
Steven Miers