Commit Graph

4645 Commits

Author SHA1 Message Date
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Steven Miers df9352d608 One more merge artifact. 2014-11-03 18:38:06 -06:00
Steven Miers 2400a8869e Remove them for real. 2014-11-03 18:32:45 -06:00
Steven Miers c24b5df66d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-03 18:31:57 -06:00
Steven Miers 9222ac5843 Remove merge artifacts. 2014-11-03 18:31:42 -06:00
Steven Miers 8c2fe619ea Remove screenshot files. 2014-11-03 18:29:14 -06:00
Steven Miers b2219da522 Merge feature/video_mvp to develop and resolve conflicts. 2014-11-03 18:28:28 -06:00
Steven Miers fe9bd594b4 Merge feature/video_mvp to develop and resolve conflicts. 2014-11-03 18:25:33 -06:00
Seth Call c11ae11c99 * fix my sorry teaspoon tests 2014-11-03 15:45:29 -06:00
Seth Call 4f9bdb2c5c * VRFS-2404 There are cases where a session can incorrectly get stuck in a 'I'm still recording' state 2014-11-03 15:24:46 -06:00
Steven Miers b2441ec7d6 Fix test; re-enable factory. 2014-11-03 14:17:20 -06:00
Steven Miers 608b0337c6 This is now unnecessary as it is done at a lower level. 2014-11-03 14:16:58 -06:00
Steven Miers 19a19a57a7 Whack thin as we no longer need it. 2014-11-03 14:16:36 -06:00
Steven Miers 0172f1c370 Better lining up of checkbox labels. 2014-11-03 14:15:36 -06:00
Steven Miers fdf42259f1 Convert to HAML. 2014-11-03 14:15:23 -06:00
Seth Call f402f630e1 * added test for VRFS-2432 notification of steram mix and share dialog 2014-11-03 10:29:22 -06:00
Seth Call fc4d55ba84 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-03 10:02:40 -06:00
Seth Call ace7ac15c8 * VRFS-2432 notify when stream mix is done 2014-11-03 10:00:42 -06:00
Steven Miers dde5a75a45 VRFS-1849 : Add checkboxes for upload_to_youtube and save_to_computer. 2014-11-02 23:07:11 -06:00
Steven Miers 809e5e7443 Hook tested youtube client library to recording api controller. Completes: (VRFS-2030, VRFS-2031, VRFS-2032) 2014-11-02 23:00:37 -06:00
Steven Miers 83de0b920e VRFS-2031 : Verify upload when complete and mark fully_uploaded. Spec to verify. 2014-11-02 22:34:02 -06:00
Brian Smith c629f3d8bf fix typo 2014-11-02 21:20:44 -05:00
Brian Smith baf976e1b6 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-02 21:18:36 -05:00
Brian Smith 2688bba63e VRFS-2296 ensure hover bubble is displayed fully on screen 2014-11-02 21:18:30 -05:00
Seth Call 1327229048 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-02 20:08:12 -06:00
Steven Miers 5c281c11c5 Proper status check of uploaded file and working spec to verify. (VRFS-2030, VRFS-2031, VRFS-2032) 2014-11-02 19:49:53 -06:00
Brian Smith 0007930936 VRFS-2401 revert to inline styles for email links for now, need to revisit better solution 2014-11-02 16:43:56 -05:00
Seth Call 66c708a347 * fix getting started test 2014-11-02 13:50:59 -06:00
Brian Smith ae20d53d3d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-02 14:27:07 -05:00
Brian Smith 33a431f822 VRFS-2427 fixed broken test 2014-11-02 14:26:56 -05:00
Seth Call e654aba980 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-02 13:16:12 -06:00
Seth Call daecbd8a2d * VRFS-2440 - open FTUE immediately after dialog 2014-11-02 13:15:56 -06:00
Brian Smith 6f3075a3ba VRFS-2297 added tool tip to instruments on session info web page 2014-11-02 13:25:52 -05:00
Brian Smith eb56be97dd VRFS-2427 fix sorting / paging issue on Feeds screen 2014-11-02 12:57:43 -05:00
Brian Smith ba80b25727 VRFS-2297 added tool tip to band tab of musician profile, couple of other bug fixes 2014-11-01 23:56:52 -04:00
Brian Smith 6b01415484 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-01 23:35:27 -04:00
Brian Smith bdb57e6d54 VRFS-2297 added tool tips to session and recording hover bubbles 2014-11-01 23:35:17 -04:00
Brian Smith 1bfd3f653c VRFS-2297 create help bubbles / tool tips for all instrument and friends/followers/recordings/sessions icons throughout app 2014-11-01 23:03:20 -04:00
Seth Call 5f8953011c * VRFS-2439 fix spurious -i argument in normalize-ogg and mp3 command 2014-11-01 21:21:42 -05:00
Seth Call f0d675c10d * fix typo in exist check 2014-11-01 21:10:12 -05:00
Steven Miers 0f1c436f60 Merge 2014-11-01 10:43:33 -05:00
Steven Miers 38cc681817 Further develop test. 2014-10-31 13:13:47 -05:00
Jonathan Kolyer e7b8d05f6d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-10-31 05:05:05 +00:00
Jonathan Kolyer 6f28ca7874 VRFS-2132 modified crash_dumps to accept dump files and upload them to aws 2014-10-31 05:04:48 +00:00
Steven Miers 80be3c572f Enable spec fo and fix youtube upload signing function. VRFS-2032 2014-10-30 20:47:28 -05:00
Steven Miers 47415c27d3 Additional note in writeup. 2014-10-30 19:51:06 -05:00
Steven Miers cc0d33e6da Set new user and test server. 2014-10-30 19:05:06 -05:00
Steven Miers d7f6d089d8 Use new test user account and port for build server. 2014-10-30 19:03:29 -05:00
Steven Miers 41314f6892 Turns out we *need* the email in several places where the official docs call for the client_id. Weird. (VRFS-2030, VRFS-2031, VRFS-2032). 2014-10-30 18:39:58 -05:00
Steven Miers 0d1baacff7 Preliminary oauth testing documentation - will put on wiki. 2014-10-30 18:39:39 -05:00