Commit Graph

1177 Commits

Author SHA1 Message Date
Brian Smith 75f1098ca3 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-14 03:13:27 -04:00
Seth Call 1183d0790c * add default to exiting sales databases 2015-04-13 16:05:43 -05:00
Seth Call eee6be5d0b * VRFS-2978 - give temporary pass to payment screen if you just filled out info 2015-04-13 15:54:23 -05:00
Brian Smith b81222278d merge develop 2015-04-13 08:16:45 -04:00
Jonathan Kolyer 252beca091 VRFS-2895 added unsubscribe link to email footer that doesnt require login 2015-04-12 11:03:12 +00:00
Seth Call ab2925ef88 VRFS-2821 - payment history screen added 2015-04-12 13:46:22 -05:00
Brian Smith 5a4157c563 check for nil 2015-04-10 20:19:53 -04:00
Seth Call e42b926a5e * VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases 2015-04-10 15:19:08 -05:00
Brian Smith 246efbdaa8 merge develop 2015-04-09 20:47:01 -04:00
Seth Call fd02e23572 * updated home page VRFS-2868 2015-04-08 22:44:21 -05:00
Seth Call 974049f204 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-08 14:36:48 -05:00
Seth Call 42dac058e1 VRFS-2884 - Update things in session and FTUE for default profile 2015-04-08 14:34:05 -05:00
Steven Miers 3fd659c3df VRFS-3019 : Fix :group_artist option on JamTrack query to not also group by id, like the regular version of the query. 2015-04-08 12:53:09 -05:00
Brian Smith 0a451742ef merge develop 2015-04-06 21:26:54 -04:00
Jonathan Kolyer 086b3bc3c4 VRFS-2795 styling and descriptions 2015-04-04 20:26:41 +00:00
Jonathan Kolyer e0d2feb84d VRFS-2795 pagination 2015-04-04 17:29:15 +00:00
Jonathan Kolyer e4795d9297 VRFS-2795 fixed filter description issue 2015-04-04 15:36:15 +00:00
Jonathan Kolyer e563ad0d8b Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-04-04 14:56:36 +00:00
Brian Smith 91e9e73644 VRFS-2701 adding SoundCloud/YouTube sources fully functional 2015-04-04 21:46:37 -04: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 4f7c43b9d8 VRFS-2795 cloning old search code into new musician_search 2015-04-02 14:52:16 +00: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
Seth Call c0e541b49d * importer 2015-04-01 20:38:54 -05:00
Seth Call d3cc9fa6af * download master command 2015-04-01 20:35:23 -05: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
Seth Call b1b2d3ad24 * VRFS-2869 - band landing page 2015-03-31 16:17:17 -05:00
Seth Call 47c6b3ec16 * VRFS-2870 - tests add for individual jam track song page 2015-03-31 15:17:43 -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
Jonathan Kolyer ddc4decfd3 merging feature/musician_profile_enhancements 2015-03-30 06:07:43 +00:00
Seth Call 3d43f123b1 * VRFS-2992 -make mp3 as well as ogg preview 2015-03-29 21:51:14 -05: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 4f08f6acad Merge and fix 2015-03-27 09:54:01 -05:00
Seth Call e2957592ea VRFS-2605 - audiomixer manifest updated for volume and offsets 2015-03-26 17:45:23 -05:00
Steven Miers 3f994e3993 Merge branch 'develop' into feature/jam_track_ui_2 2015-03-26 11:59:49 -05:00
Steven Miers bb4ea7cd94 Merge branch 'feature/jam_track_ui_2' of bitbucket.org:jamkazam/jam-cloud into feature/jam_track_ui_2 2015-03-26 11:59:42 -05:00
Seth Call ef78471b59 Merge cherry pick 2015-03-26 11:58:41 -05:00
Seth Call 4a36bc6982 * VRFS-2988 - relax position duplication constraint 2015-03-26 10:16:14 -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 0848a59082 * merged develop again 2015-03-25 14:32:03 -05: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
Steven Miers 5f953d1b19 VRFS-2830 : Merge / manual fix 2015-03-25 10:56:24 -05:00
Steven Miers adef8c8c45 VRFS-2830 : Payment History
API, client, view, styles and test
2015-03-24 17:13:09 -05:00
Seth Call 18563ff065 * VRFS-2890 fix infinite scroll as well as bug with limit vs per_page style scrolling 2015-03-24 14:59:20 -05:00
Seth Call bfe302b2f1 * merged 2015-03-24 14:43:48 -05:00