Commit Graph

733 Commits

Author SHA1 Message Date
Seth Call d63d3ba1b2 * wip 2015-07-10 10:49:48 -05:00
Seth Call 3eea6c89d5 Merge branch 'develop' into feature/new_session
Conflicts:
	web/app/assets/javascripts/fakeJamClient.js
	web/app/assets/javascripts/globals.js
	web/app/assets/javascripts/trackHelpers.js
	web/app/assets/javascripts/utils.js
	web/app/views/dialogs/_dialogs.html.haml
2015-07-08 12:34:06 -05:00
Seth Call f520b889e5 * wip 2015-07-08 12:17:45 -05:00
Seth Call 08ccda245e * wip 2015-07-06 14:23:33 -05:00
Steven Miers 0d8beef0e2 VRFS-3190 : Last band test fixed 2015-06-17 15:56:29 -05:00
Steven Miers d37383a578 VRFS-3190 : Fix more band tests. 2015-06-17 15:04:27 -05:00
Steven Miers e6d1980495 VRFS-3190 : Fix band tests, add new tests for new tabs / cleanup 2015-06-16 17:55:55 -05:00
Steven Miers cfda14e16e VRFS-3190 : Merge with latest develop branch 2015-06-16 12:23:57 -05:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00
Steven Miers 01c3b8af5f VRFS-3190 : Use scoped classes instead of ids for navigation buttons. Initialize musician profile samples properly. 2015-06-05 12:55:55 -05:00
Steven Miers 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
Steven Miers 1c93cdb797 VRFS-3243 : Fix tests 2015-05-19 13:33:25 -05:00
Steven Miers d684ecda3b Merge with latest from develop and manually fix. 2015-05-18 16:02:07 -05:00
Seth Call eba9afab04 * fix bug in ability to open JamTrack 2015-05-15 15:30:15 -05:00
Seth Call 8e7ebcf3d6 * VRFS-3236 - update landing pages for jamtracks 2015-05-15 15:02:00 -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 193888f960 VRFS-3242 : Merge with latest develop 2015-05-13 20:56:58 -05:00
Seth Call 2723cd8a78 * VRFS-3215 - add checkoutComplete URL 2015-05-12 14:14:44 -05:00
Steven Miers b0fd3fd4c8 VRFS-3007 : Test for presence of online presence and performance samples for musician profile feature. Also, add classes to ease identification of dynamically added elements. Fix a few style issues. 2015-05-11 17:25:57 -05:00
Steven Miers 294c01d44a Merge with latest develop 2015-05-11 17:25:37 -05:00
Steven Miers a23033ebcd VRFS-3007 : Dedicated tests for musician profile -- incremental 2015-05-11 09:03:08 -05:00
Seth Call 62b6820e90 * VRFS-3220 - estimate taxes manually 2015-05-09 08:30:12 -05:00
Seth Call 12eeb460a3 * VRFS-3212 - track counts of concurrent packaging attempts 2015-05-07 08:49:15 -05:00
Steven Miers d208a8cd82 VRFS-3007 : Change text to what is observed. I'm not 100% sure about this, so I'm going to run with it in this branch for a bit. 2015-05-06 13:26:23 -05:00
Steven Miers cf6ceb6b38 VRFS-3007 : This doesn't actually appear (fixes test). 2015-05-06 13:25:12 -05:00
Seth Call af98559dfd * VRFS-3181 hide availability filter 2015-05-04 18:01:03 -05:00
Steven Miers 4c4121e4d7 Merge with latest develop 2015-05-01 20:00:08 -05:00
Steven Miers 77ce45d7c6 VRFS-3119 : Comment about broken feature/test. 2015-05-01 13:49:59 -05:00
Steven Miers b39ab852ba VRFS-3007 : Fix a few more musician search API and feature tests. 2015-05-01 12:09:23 -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 6c1371c619 VRFS-3007 : Fix profile history specs. 2015-04-30 20:53:19 -05:00
Steven Miers 7359cb36bf VRFS-3007 : Fix feed tests (bad selector). 2015-04-30 20:48:26 -05:00
Steven Miers 5ba6e1ed18 VRFS-3007 : Fix band feature specs (bad selector). 2015-04-30 20:37:40 -05:00
Steven Miers 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -05:00
Seth Call a70e90ab8c * VRFS-3099 - fix left over download confirmation on checkout page if you re-enter it 2015-04-28 10:33:42 -05:00
Seth Call cada0ed0b9 * VRFS-3112 - make recording smaller so no horizontal scroll bar 2015-04-28 09:44:56 -05:00
Seth Call 907e2a4552 * fix jamtrack shopping tests for the change in button text 2015-04-27 13:42:03 -05:00
Seth Call 776858c391 * VRFS-3087 - disable filter dropdowns 2015-04-24 13:45:47 -05:00
Seth Call d94388161c * fixing recording-based tests and one checkout test 2015-04-24 12:09:22 -05:00
Seth Call 4cce21e7f8 * VRFS-3080 - partial refund manual process done 2015-04-23 16:20:21 -05:00
Seth Call d66f8e50d1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-22 15:47:57 -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
Steven Miers 75ac40e765 VRFS-3055 : Fix broken gear wizard spec. Add additional test to verify 2015-04-22 15:36:21 -05:00
Steven Miers a9ab5bb730 Merge video_ui branch into develop. 2015-04-21 13:47:00 -05:00
Steven Miers 6f4c8d819d VRFS-3055 : Video features on gear wizard available via config. Update spec to match behavior. 2015-04-21 09:23:57 -05:00
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call 31e17151a7 * fix jamtrack shopping test 2015-04-19 18:03:26 -05:00