Commit Graph

570 Commits

Author SHA1 Message Date
Jonathan Kolyer 1bd1794318 VRFS-3036 band web search args 2015-05-27 08:20:46 +00:00
Jonathan Kolyer 8480f582ad VRFS-3036 tuning band search filter spec 2015-05-27 05:08:56 +00:00
Jonathan Kolyer f66cf79cf2 VRFS-3036 band search filter tests 2015-05-27 04:10:05 +00:00
Jonathan Kolyer 9757712977 VRFS-3036 testing filter by key 2015-05-27 02:58:04 +00:00
Jonathan Kolyer 38881216fc VRFS-3036 genre filter spec 2015-05-27 02:14:39 +00:00
Jonathan Kolyer 7edee8d494 VRFS-3036 first pass testing 2015-05-26 08:43:11 +00:00
Seth Call c96f0a7859 * VRFS-3260 - fraud check code and admin helpers complete 2015-05-20 09:24:17 -05:00
Steven Miers d684ecda3b Merge with latest from develop and manually fix. 2015-05-18 16:02:07 -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 12eeb460a3 * VRFS-3212 - track counts of concurrent packaging attempts 2015-05-07 08:49:15 -05:00
Seth Call d77ee8cd23 * VRFS-3173 - stats on active sessions 2015-05-04 14:37:49 -05:00
Steven Miers 4c4121e4d7 Merge with latest develop 2015-05-01 20:00:08 -05:00
Seth Call 1cd57cb4e8 * VRFS-3118 - check for high latency while in session, VRFS-3138 - fix tons of issues with user downloading both sample rates 2015-05-01 12:09:18 -05:00
Steven Miers 86c483a0d5 VRFS-3007 : Fix tests that intermittently fail depending on order (always whack users before starting). 2015-04-30 13:14:25 -05:00
Steven Miers 4ffb46b755 VRFS-3007 : Fix feed spec test failure (was intermittently passing only). 2015-04-29 19:36:50 -05:00
Steven Miers 64e84c17eb VRFS-3007 : Fix feed spec test failure (was intermittently passing only). 2015-04-29 19:09:30 -05:00
Steven Miers 2e33851e30 VRFS-3007 : Fix band filter search test failure. 2015-04-29 19:08:59 -05:00
Steven Miers 03bab53b2f VRFS-3007 : Remove redundant "model" suffix from spec name as folder is already named "model". 2015-04-29 19:06:33 -05:00
Steven Miers 5b43688443 VRFS-3007 : Fix failure on musician search spec. 2015-04-29 15:34:28 -05:00
Steven Miers cf515a9cf0 VRFS-3007 : Fix tests and models failing due to PermissionError 2015-04-29 12:56:16 -05:00
Steven Miers 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -05:00
Seth Call 4cce21e7f8 * VRFS-3080 - partial refund manual process done 2015-04-23 16:20:21 -05:00
Steven Miers 74a0cbd18e Fix intermittent failure. 2015-04-21 16:23:10 -05:00
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call 022304c6af * VRFS-3065 - permission error name change 2015-04-20 10:42:09 -05:00
Seth Call fefd5a3fda * jamtrack UI fixes: VRFS-3041 (ordering fixed), VRFS-3004 - loading/no more jamtrack notice fixes, and VRFS-3005 - filter by band works 2015-04-16 15:44:38 -05:00
Seth Call 4cf4e21552 * VRFS-2938 - packaging phase now shows % indicator 2015-04-16 14:45:29 -05:00
Seth Call 19ad2fbcc5 * VRFS-2991 - sitemap generator done (but still vetting other parts of the site for basic SEO) 2015-04-14 16:39:39 -05:00
Seth Call 06c964a151 * VRFS-2977 - make facebook signup work with checkout flow 2015-04-14 14:12:24 -05:00
Brian Smith b81222278d merge develop 2015-04-13 08:16:45 -04:00
Seth Call ab2925ef88 VRFS-2821 - payment history screen added 2015-04-12 13:46:22 -05:00
Seth Call e42b926a5e * VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases 2015-04-10 15:19:08 -05:00
Brian Smith 0a451742ef merge develop 2015-04-06 21:26:54 -04:00
Jonathan Kolyer 279f97ec9a VRFS-2795 fixed broken spec 2015-04-04 23:42:41 +00:00
Jonathan Kolyer 086b3bc3c4 VRFS-2795 styling and descriptions 2015-04-04 20:26:41 +00:00
Jonathan Kolyer e4795d9297 VRFS-2795 fixed filter description issue 2015-04-04 15:36:15 +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
Seth Call 821ca9d76a * VRFS-2875 - sales record keeping as well as recurly hook processing 2015-04-03 15:34:12 -05:00
Jonathan Kolyer c3ede10f1d merging feature/musician_profile_enhancements 2015-04-02 14:51:33 +00:00
Brian Smith a87c08afe3 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-01 23:09:51 -04:00
Steven Miers 4c2d4958fe VRFS-2894 Update email / user info in recurly upon finalize. Test to verify. 2015-03-31 20:25:54 -05:00
Jonathan Kolyer ddc4decfd3 merging feature/musician_profile_enhancements 2015-03-30 06:07:43 +00:00
Brian Smith 83c00ea6e4 merge develop 2015-03-29 10:12:42 -04:00
Steven Miers 401fd43849 Merge branch 'feature/jam_track_ui_2' into develop 2015-03-27 15:48:08 -05:00
Steven Miers e6265f0b65 Fix test to match new behavior. 2015-03-27 12:45:17 -05:00
Seth Call e2957592ea VRFS-2605 - audiomixer manifest updated for volume and offsets 2015-03-26 17:45:23 -05:00
Jonathan Kolyer 21322318d8 VRFS-2795 latency ordering 2015-03-26 06:28:38 +00:00
Jonathan Kolyer f3344affaf VRFS-2795 distance sort order 2015-03-26 05:56:43 +00:00
Jonathan Kolyer 9eeb0e454b VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-26 03:31:21 +00:00
Seth Call f0c4647ef5 * VRFS-2981 - check for create_type = nil in scheduled_rsvp 2015-03-25 11:26:32 -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
Seth Call 1c0407cca4 * wip 2015-03-24 10:19:21 -05:00
Jonathan Kolyer 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
Brian Smith 96a816f317 merge develop 2015-03-21 10:06:53 -04: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
Brian Smith b91bc09817 Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-15 11:09:21 -04:00
Seth Call 7c73e2ab5c * VRFS-2922 - show spinner for pending metronome 2015-03-12 21:53:23 -05:00
Brian Smith 948174f19a VRFS-2701 musical experience bug fix 2015-03-12 21:34:20 -04: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
Jonathan Kolyer b998d28c37 VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-10 04:33:37 +00:00
Brian Smith d865d0a1fa Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-09 20:25:28 -04:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Jonathan Kolyer 33f10e3197 VRFS-2795 fixing search specs 2015-03-09 06:13:56 +00:00
Jonathan Kolyer 3810aecb00 merging feature/musician_profile_enhancements 2015-03-06 05:12:13 +00:00
Brian Smith e658e6f4b5 Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-05 02:18:55 -05:00
Steven Miers 63c45e0a6e VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders. 2015-03-04 16:03:57 -06:00
Steven Miers 2004d48fa1 Merge 2015-03-04 16:03:28 -06:00
Brian Smith 12b610d2cb Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-04 02:03:22 -05: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
Jonathan Kolyer 930166b213 Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-03-02 12:00:39 +00:00
Jonathan Kolyer 171dcb04f0 VRFS-2795 interests filter 2015-02-28 21:18:43 +00:00
Jonathan Kolyer 88315fcc40 VRFS-2795 instrument and genre filtering tests 2015-02-28 20:37:15 +00:00
Jonathan Kolyer d95279e694 VRFS-2795 merging feature/musician_profile_enhancements 2015-02-28 20:18:56 +00:00
Brian Smith 4d133e0043 merge develop 2015-02-28 02:24:23 -05:00
Jonathan Kolyer 2d8748d4ee VRFS-2795 iterating on tests 2015-02-28 04:24:53 +00:00
Steven Miers 5396e66c67 Merge with develop 2015-02-27 11:51:45 -06:00
Steven Miers bd08b40e71 VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders. 2015-02-26 17:00:01 -06:00
Steven Miers ef287187ba VRFS-2782 : Support multiple bit rates for jam tracks: migration, model and test updates. 2015-02-25 17:19:03 -06:00
Seth Call dbaeb8d996 merged 2015-02-25 10:43:21 -06:00
Jonathan Kolyer 2ea1259060 merging feature/musician_profile_enhancements 2015-02-24 06:08:33 +00:00
Jonathan Kolyer a2ef5e9859 VRFS-2795 gig and studio tests 2015-02-24 06:06:40 +00:00
Jonathan Kolyer 83f3d56238 VRFS-2795 musician search first draft 2015-02-23 06:21:36 +00:00
Brian Smith c961c1fdc5 fix test 2015-02-22 22:36:15 -05:00
Brian Smith 500af2bc05 merge develop (had lots of migration issues) 2015-02-20 08:35:59 -05:00
Seth Call 39415cdf22 * remove BPM from jam_tracks 2015-02-17 10:41:49 -06:00
Seth Call 42a2abe99c * merged 2015-02-15 22:01:06 -06:00
Brian Smith 28ff54b000 VRFS-2695 wip new profile API 2015-02-13 03:16:48 -05:00
Brian Smith 8bd311647a VRFS-2693 performance model/tests 2015-02-13 01:32:55 -05:00
Steven Miers aedcbde1f3 Merge with develop 2015-02-12 14:32:12 -06:00
Brian Smith 895fb92365 VRFS-2693 VRFS-2694 performance sample model wip 2015-02-11 22:33:10 -05:00
Brian Smith e3f27eeebc VRFS-2694 user presence model tests 2015-02-10 02:44:16 -05:00
Brian Smith 33aef8a380 VRFS-2694 user presence model 2015-02-05 03:34:25 -05:00
Brian Smith 05ba1ea5d3 VRFS-2694 wip user presence model and spec 2015-02-03 23:37:20 -05:00
Brian Smith 80305c05aa Merge branch 'develop' into feature/musician_profile_enhancements 2015-02-02 19:22:33 -05:00