Seth Call
34dcc27641
Merge branch 'develop' into feature/vst
2015-12-07 21:05:10 -06:00
Seth Call
886df5d092
* master mix controls for creator or delegated
2015-12-07 20:25:43 -06:00
Seth Call
d9f1becb9b
* merge
2015-12-04 11:37:59 -06:00
Seth Call
949ce8a513
* VRFS-3756 - webcam audio
2015-12-04 11:16:40 -06:00
Seth Call
223988f421
* better align
2015-12-04 09:39:33 -06:00
Seth Call
3adeef4dee
* csv/pdf links in place in the UI
2015-12-04 09:27:28 -06:00
Seth Call
5049e3f813
* generate CSV and PDF for jamtracks
2015-12-04 08:32:18 -06:00
Seth Call
54a437d6e1
* VRFS-3725 - frontend support for click tracks and tap-in creation
2015-12-03 14:21:07 -06:00
Seth Call
7f0fd988ce
* add gift card image
2015-11-30 05:07:47 -06:00
Seth Call
184bf2ba4d
* merge
2015-11-19 22:09:11 -06:00
Seth Call
c2772398a8
* importer
2015-11-19 22:07:38 -06:00
Seth Call
d3d2fbb210
* generate jmep automatically
2015-11-18 15:22:06 -06:00
Seth Call
7fbb215fca
* VRFS-3708 - allow redemption of gift cards
2015-11-13 07:12:58 -06:00
7a2dd6ea0b
VRFS-3459 merging develop
2015-10-19 19:58:41 +00: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
0c25d0e40b
merging develop
2015-10-05 14:06:39 +00:00
Seth Call
cb76a6e28f
* VRFS-3588 generating AAC's for master previews
2015-09-29 19:57:31 -05:00
Seth Call
4a647b8bd1
* VRFS-3519 - client and server jamtrack mixdown support
2015-09-21 20:01:39 -05:00
5c0178df8f
VRFS-3393 jam_track has_many genres support
2015-09-21 01:00:37 +00:00
Seth Call
468b0c4998
* adding guess code and fixing importer
2015-09-20 15:14:45 -05:00
Seth Call
e7b50ca4a8
* VRFS-3449 - updates for direct landing pages
2015-08-20 14:19:07 -05:00
Seth Call
37d6c3e57c
* add csv to dump released JamTracks
2015-08-18 15:19:40 -05:00
Seth Call
f6101f3621
VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing
2015-08-18 14:26:41 -05:00
Seth Call
c4981376ac
* set storage format for sync_all_dev
2015-08-13 11:13:13 -05:00
aa36b2f215
merging develop
2015-08-04 13:44:47 +00: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
55ccf89e64
* VRFS-3396 took out carmen gem; database in production/staging has display names in db
2015-07-28 14:11:28 -05:00
Seth Call
4b7e7c1c7f
* ignore ssl errors in phantomjs
2015-07-20 07:58:15 -05:00
Seth Call
f6d54a57f5
* test fixes
2015-07-19 09:57:40 -05:00
Seth Call
3b71931e73
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
3eca6aeee5
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-06-04 05:59:31 +00:00
d5a8959677
Merge with develop.
2015-06-03 14:22:21 -05:00
da58ac6eab
merging
2015-05-22 08:20:07 +00:00
d684ecda3b
Merge with latest from develop and manually fix.
2015-05-18 16:02:07 -05:00
737367b016
VRFS-3036 building out band search filter features, refactoring musician search filter
2015-05-18 04:00:12 +00:00
Seth Call
0264c539b1
*hardcoding https where http is found
2015-05-15 18:25:47 -05:00
Seth Call
939f8cdf82
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34: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
62b6820e90
* VRFS-3220 - estimate taxes manually
2015-05-09 08:30:12 -05:00
7b5cdbf390
VRFS-3106 : Populate country name and state(region) labels using carmen gem.
2015-05-06 15:35:41 -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
d4d8489ef1
VRFS-3007 : Fix faulty logic when extracting recording data. Addresses a few test failures.
2015-04-30 19:31:44 -05:00
2260d21fc1
VRFS-3007 : Merge with latest develop
2015-04-28 16:43:38 -05:00
a9ab5bb730
Merge video_ui branch into develop.
2015-04-21 13:47:00 -05:00
Seth Call
9480aadaae
Conflicts:
...
ruby/lib/jam_ruby/models/jam_track_track.rb
2015-04-20 13:55:33 -05:00
Seth Call
022304c6af
* VRFS-3065 - permission error name change
2015-04-20 10:42:09 -05:00
766568f8cb
Merge and fix
2015-04-16 12:16:09 -05:00
e563ad0d8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 14:56:36 +00:00
4fbf3e694d
VRFS-2795 filter description & spec tests; support for reset, cancel buttons; proper display and update impl
2015-04-04 14:55:41 +00:00
Seth Call
Jonathan Kolyer
Steven Miers