Commit Graph

5764 Commits

Author SHA1 Message Date
Steven Miers 6c84abdfba Whack test output images. 2015-04-22 15:36:22 -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 b916d4d997 VRFS-3055 : Multiple levels of config option video_available
“none”, “mvp”, and “full”.  “mvp” mode is similar to full, except it
hides video recording functionality.
2015-04-22 15:36:21 -05:00
Seth Call 39f45f20ba * VRFS-3078 - show original price in void purchase 2015-04-22 14:20:07 -05:00
Seth Call 2fc8041f3f * VRFS-3077 - fix issue with no null check of current_user 2015-04-22 14:04:20 -05:00
Seth Call 05b4b8f3fa * VRFS-2605 -tested mixer manifest with latest client with jamtrack offsets and all of that 2015-04-22 14:02:44 -05:00
Seth Call 9217e92372 * protect against video calls when in account screen 2015-04-22 10:21:08 -05:00
Seth Call 763ade01dd * protect against webcamViewer from getting involved if video is not available 2015-04-22 10:18:33 -05:00
Seth Call a3021479fd Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-22 09:45:08 -05:00
Seth Call 49ef08ff5d * prepare production db for preview URLS, and save jam_track after setting duration in the sync task 2015-04-22 09:44:57 -05:00
Steven Miers 8f49d7b83f Merge remote-tracking branch 'origin/develop' into develop 2015-04-21 18:30:17 -05:00
Steven Miers c3134d8177 VRFS-3070 : Webcam selection & state fixes
* Hook up test webcam button
* Handle object vs. string from client method.
2015-04-21 18:30:02 -05:00
Steven Miers 196ed1340e VRFS-3070 : Fix text that alludes to embedded webcam. 2015-04-21 18:28:16 -05:00
Seth Call 67c9f5d891 * VRFS-2605 - automatically stop recording if jamtrack is playing 2015-04-21 16:34:57 -05:00
Seth Call 3181a67bda * VRFS-2605 - prevent close of jamtrack or backing track while recordig 2015-04-21 16:30:40 -05:00
Seth Call 1ce41c5a54 * VRFS-2605 - refining jamtrack offset values and manifest for audiomixer, and fixnig bug with jamtrack monitoring applied to playcontrols.js by accident 2015-04-21 16:24:10 -05:00
Steven Miers 74a0cbd18e Fix intermittent failure. 2015-04-21 16:23:10 -05:00
Steven Miers 7a760e087b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-21 14:29:43 -05:00
Seth Call 655f59fc52 * remove puts 2015-04-21 14:08:16 -05:00
Seth Call ed0d69db13 * require tzinfo explicitely 2015-04-21 13:54:08 -05:00
Steven Miers a9ab5bb730 Merge video_ui branch into develop. 2015-04-21 13:47:00 -05:00
Seth Call 556347f35b * VRFS-2605 compute offset and seeks in manifest 2015-04-21 13:46:33 -05:00
Seth Call 03072b2e8d * VRFS-2605 - compute offset and seek based on client info 2015-04-21 11:26:55 -05:00
Seth Call 8369ef0e13 * VRFS-3051 - pass userId into JamTrackDownload bridge call 2015-04-21 10:30:37 -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
Steven Miers ea45c286ea VRFS-3055 : Make video features optional via config option. 2015-04-21 09:21:55 -05:00
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call 72af829645 * VRFS-3066 - fix bug with rsvp_request controller not using api_signed_in_user filter (causing 500 errors on the service) 2015-04-20 21:31:08 -05:00
Seth Call 2480be23ab * make the addition of duration column to jam tracks failable, since this has been applied to production in advance of the real migration 2015-04-20 20:40:50 -05:00
Seth Call 35ccd39979 * fix id-generator 2015-04-20 17:39:45 -05:00
Seth Call 8bb37c5a65 * fix incrementer 2015-04-20 14:56:10 -05:00
Seth Call b60ded91d7 * fix typo in JamTrack download notification VRFS-3064 2015-04-20 13:58:58 -05:00
Seth Call 0236353ee7 VRFS-3048 - resync task for audio updates to existing jamtracks 2015-04-20 13:56:05 -05:00
Seth Call 9480aadaae Conflicts:
ruby/lib/jam_ruby/models/jam_track_track.rb
2015-04-20 13:55:33 -05:00
Seth Call 022304c6af * VRFS-3065 - permission error name change 2015-04-20 10:42:09 -05:00
Seth Call 375ec7008d * wip 2015-04-20 10:42:00 -05:00
Seth Call 31e17151a7 * fix jamtrack shopping test 2015-04-19 18:03:26 -05:00
Seth Call 1763c151bd * VRFS-3061 - deal with shopping cart porting over correctly when user logs in during shopping 2015-04-19 16:40:35 -05:00
Seth Call 6991e8afaf * VRFS-3057 - shopping cart to reflect real price 2015-04-19 12:19:05 -05:00
Seth Call fc99fbce6c * VRFS-3058 - fix uniqueness constraint on ShoppingCart and test 2015-04-19 11:43:54 -05:00
Seth Call 64836c1a44 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-18 20:46:49 -05:00
Seth Call b618fea59d * VRFS-3054 - set default sales_region to any availability 2015-04-18 20:46:20 -05:00
Steven Miers a2c64ee13a VRFS-1848 : Make sure save/discard buttons are enabled after validation. Make event handler registration idempotent. 2015-04-17 17:55:23 -05:00
Seth Call e882bb272c * VRFS-3050 - disable configure button for playback profile 2015-04-17 16:32:53 -05:00
Steven Miers c0e36d0f9e VRFS-1848 : Better state management for recording finished dialog WRT google authorization / youtube errors. Hide youtube errors via ajax upon successful login. 2015-04-17 15:29:19 -05:00
Seth Call 1809b0213b * VRFS-3043 - pass along preview timeline data in preview 2015-04-17 15:01:56 -05:00
Seth Call a2e5d941c1 * remove double scrollbars when in client on the shopping cart page VRFS-3052 2015-04-17 14:09:29 -05:00
Seth Call 3c37cbbf59 * VRFS-3042 - remove duplicate registrations on pagination 2015-04-17 14:01:07 -05:00
Steven Miers b6fad726c4 VRFS-1848 : Halt claim recording and show error if "Save to Youtube" selected, but not logged into google. 2015-04-17 13:22:20 -05:00
Seth Call 3a2590a472 * VRFS-3037 - code added without testing, and VRFS-3039 - download link added to checkout confirmation screen if you've not downloaded the app yet 2015-04-17 09:39:27 -05:00