Commit Graph

131 Commits

Author SHA1 Message Date
Seth Call 150c5da5b3 * remove rails react img 2015-10-23 07:52:33 -05:00
Seth Call 276442a9b4 * VRFS-3512 - upload videos to youtube 2015-10-07 21:12:26 -05:00
Seth Call de9856b5be * pin back react-select 2015-09-21 21:11:01 -05:00
Seth Call 4a647b8bd1 * VRFS-3519 - client and server jamtrack mixdown support 2015-09-21 20:01:39 -05:00
Seth Call f6101f3621 VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing 2015-08-18 14:26:41 -05:00
Jonathan Kolyer aa36b2f215 merging develop 2015-08-04 13:44:47 +00:00
Seth Call 05028cc45c * noop 2015-07-23 15:00:48 -05:00
Seth Call 4345d898f7 * VRFS-3348 - support JamTrack opening automatically when opened from account page 2015-07-21 08:08:34 -05:00
Seth Call d280a53e48 * fix metronome personal/master bug; try to fix intermittent fail 2015-07-17 16:02:36 -05:00
Seth Call cd37c85c68 * fix more tests and disable autorun of test-unit now that we have to include it as a dependency 2015-07-16 13:55:00 -05:00
Seth Call efe3dea8e3 * updating Rails to 3.2.22 to allow compat with ruby 2.2.2 2015-07-16 10:58:03 -05:00
Seth Call 3b71931e73 merge conflict from feature/new_session (VRFS-3283) 2015-07-15 10:04:45 -05:00
Jonathan Kolyer 832e716e8b Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-06-28 19:52:45 +00: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
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
Seth Call ecd8b75f91 * fix case in raleway assets path 2015-05-29 23:21:29 -05:00
Seth Call 7199a76e3d * cors gem added to gemfile for cloudfront and https 2015-05-29 22:41:01 -05:00
Jonathan Kolyer 777d4a39cb VRFS-3036 tohire builder 2015-05-21 06:42:27 +00:00
Jonathan Kolyer e794ccc7af VRFS-3036 bands to_join builder controls 2015-05-19 05:48:29 +00:00
Steven Miers 294c01d44a Merge with latest develop 2015-05-11 17:25:37 -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
Steven Miers ccb4680c36 This seems to be required now. 2015-05-06 13:24:21 -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
Seth Call 5970fae4fa * VRFS-3188 - sort instrument appropriately 2015-05-05 09:22:15 -05:00
Steven Miers 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -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
Jonathan Kolyer 086b3bc3c4 VRFS-2795 styling and descriptions 2015-04-04 20:26:41 +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
Steven Miers c8ad1d3856 VRFS-2805 : Use jquery.payment to make the credit card and verification more user-friendly. Also use jquery.payment for validation. 2015-03-02 13:30:45 -06:00
Steven Miers aedcbde1f3 Merge with develop 2015-02-12 14:32:12 -06:00
Seth Call b89e6e9475 * VRFS-2748, VRFS-2749 - update styling for / page and home page 2015-02-06 22:04:37 -06:00
Steven Miers 5f9f8a0cdd Cleanup; upgrade deprecated gem. Attempt to fix intermittently failing test. 2015-01-16 18:00:44 -06:00
Steven Miers a900087d87 VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests. 2015-01-11 19:17:18 -06:00
Steven Miers 9d5d36f059 VRFS-2540 : Clean out some existing recaptcha scaffolding.
Current recaptcha gem only works within controllers, so pass flag down
the stack when recaptcha fails.  Respect application config for
“recaptcha_enable” at all levels higher than user level.  Allows usage
of existing mechanism for attribute validation and passing subsequent
errors back to the UI for reporting.
2015-01-05 17:01:28 -06:00
Seth Call 786486026b * wip 2014-12-30 17:10:16 -06:00
Seth Call 4a79f0c4ec * wip 2014-12-20 14:05:31 -06:00
Steven Miers c068619d4d Lock guard gem version to avoid warning. 2014-11-13 11:06:03 -06:00
Steven Miers c742a13da9 Fix a few specs. 2014-11-12 11:02:38 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Steven Miers b2219da522 Merge feature/video_mvp to develop and resolve conflicts. 2014-11-03 18:28:28 -06:00
Seth Call 1552f72192 * pin down rabl until fix for cache key is present (VRFS-2369 and VRFS-2374) 2014-10-26 08:05:33 -05:00
Steven Miers e3dadf9c4b VRFS-2032 : Youtube test account app name/developer key. 2014-10-15 15:17:03 -05:00
Steven Miers 077d3f4253 VRFS-2033 - YouTube client library 2014-10-15 12:25:05 -05:00
Seth Call 2d71a12a79 * pinning back oj for now 2014-10-06 14:53:50 -05:00
Seth Call 993074b136 * pinning back devise 2014-10-06 09:36:55 -05:00
Seth Call 61f0bd2aa0 * merged 2014-09-22 14:20:58 -05:00
Seth Call 8a4038e7ce * pinning capybara-screenshot; it just released a breaking version (1.0.0) 2014-09-17 20:57:49 -05:00
Seth Call 27f4adf772 * VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs 2014-08-18 20:41:44 -05:00