Seth Call
c4981376ac
* set storage format for sync_all_dev
2015-08-13 11:13:13 -05:00
Jonathan Kolyer
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
Jonathan Kolyer
3eca6aeee5
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-06-04 05:59:31 +00:00
Steven Miers
d5a8959677
Merge with develop.
2015-06-03 14:22:21 -05:00
Jonathan Kolyer
da58ac6eab
merging
2015-05-22 08:20:07 +00:00
Steven Miers
d684ecda3b
Merge with latest from develop and manually fix.
2015-05-18 16:02:07 -05:00
Jonathan Kolyer
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
Steven Miers
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
Steven Miers
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
Steven Miers
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
Steven Miers
d4d8489ef1
VRFS-3007 : Fix faulty logic when extracting recording data. Addresses a few test failures.
2015-04-30 19:31:44 -05:00
Steven Miers
2260d21fc1
VRFS-3007 : Merge with latest develop
2015-04-28 16:43:38 -05:00
Steven Miers
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
Steven Miers
766568f8cb
Merge and fix
2015-04-16 12:16:09 -05:00
Jonathan Kolyer
e563ad0d8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 14:56:36 +00:00
Jonathan Kolyer
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
Brian Smith
2f8d048dde
VRFS-2701 updated site validator lib to extract recording title for YouTube and SoundCloud URLs
2015-04-04 02:31:12 -04:00
Jonathan Kolyer
1f432446f5
VRFS-2795 fixing results display; generating same data
2015-04-04 02:54:58 +00:00
Seth Call
d3cc9fa6af
* download master command
2015-04-01 20:35:23 -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
ccd60aa631
* merged develop
2015-03-24 11:27:26 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
Seth Call
7c73e2ab5c
* VRFS-2922 - show spinner for pending metronome
2015-03-12 21:53:23 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
Seth Call
9415593244
* merged
2015-02-27 08:41:49 -06:00
Seth Call
38849a1c44
VRFS-2804 - fix code to find the jamtrack ID correctly based on recent client changes
2015-02-19 15:56:42 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Steven Miers
0907c1acd1
VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate.
2015-02-19 01:06:50 -06:00
Jonathan Kolyer
6a46ad5910
Merge branch 'develop' into feature/recording_selector
2015-02-16 02:20:38 +00:00
Jonathan Kolyer
6ff4d197ef
VRFS-2700 recording source jasmine tests
2015-02-15 23:10:29 +00:00
Steven Miers
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
Jonathan Kolyer
5e6a63db2e
VRFS-2700 added rec_* site types to site validation
2015-02-12 08:16:54 +00:00
Jonathan Kolyer
fa25e87659
Merge branch 'develop' into feature/site_validator
2015-02-10 03:17:33 +00:00
Seth Call
df60a43404
* adding gear dump
2015-02-09 18:07:49 -06:00
Jonathan Kolyer
e466ca0f5a
VRFS-2698 implemented site_validator
2015-02-08 06:10:31 +00:00
Jonathan Kolyer
90f3d9efe1
VRFS-2698 refactoring
2015-02-06 07:43:24 +00:00
Jonathan Kolyer
d52f5b2372
VRFS-2698 repurposed urls into usernames
2015-02-06 07:43:24 +00:00
Seth Call
ac1271634d
* VRFS-2716 - changes to deal with new getBackingList format, VRFS-2661 - accepting backing_track info in Track.sync (wip)
2015-01-31 15:20:48 -06:00
Seth Call
96bc9487c4
* merged
2015-01-29 16:13:40 -06:00