Commit Graph

167 Commits

Author SHA1 Message Date
Seth Call 42dac058e1 VRFS-2884 - Update things in session and FTUE for default profile 2015-04-08 14:34:05 -05:00
Seth Call c276d97e42 * pass in data with metronome open stat 2015-04-01 09:04:52 -05:00
Seth Call 80a48c60c6 * VRFS-2879 - adding 3 product pages (jamblaster, platform, jamtracks) 2015-03-31 21:08:09 -05:00
Seth Call 260a80ee37 * VRFS-2987 - remote participants can see opened JamTracks 2015-03-28 10:10:18 -05:00
Seth Call 23fdf51110 * resize session based on track content VRFS-2819 2015-03-27 15:36:09 -05:00
Seth Call e2957592ea VRFS-2605 - audiomixer manifest updated for volume and offsets 2015-03-26 17:45:23 -05:00
Seth Call 1e1e6222bb * VRFS-2686 - if user seeks to 0, then offest it back to beginning of JamTrack (before prelude) 2015-03-25 15:01:22 -05:00
Seth Call 31e4fbfdf8 * suppress metronome logic when JamTrack is open VRFS-2971 2015-03-25 14:45:51 -05:00
Seth Call bfe302b2f1 * merged 2015-03-24 14:43:48 -05:00
Seth Call ccd60aa631 * merged develop 2015-03-24 11:27:26 -05:00
Jonathan Kolyer 8c2df0bb6b VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting 2015-03-23 20:06:32 +00:00
Seth Call 128a8119cf * VRFS-2942 - show correct instrument and show correct part info 2015-03-20 22:04:03 -05:00
Seth Call e82da2161d * VRFS-2927 - mute both master/personal for own tracks 2015-03-14 15:00:11 -05:00
Seth Call 7c73e2ab5c * VRFS-2922 - show spinner for pending metronome 2015-03-12 21:53:23 -05:00
Seth Call f9e02c5707 Merge branch 'develop' into feature/jam_track_ui_2
Conflicts:
	admin/app/admin/jam_tracks.rb
	admin/app/views/admin/jam_tracks/_form.html.slim
	admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
	admin/config/initializers/jam_tracks.rb
	db/manifest
	ruby/lib/jam_ruby.rb
	ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
	ruby/lib/jam_ruby/jam_tracks_manager.rb
	ruby/lib/jam_ruby/models/jam_track.rb
	ruby/lib/jam_ruby/models/jam_track_right.rb
	ruby/lib/jam_ruby/models/jam_track_track.rb
	ruby/spec/jam_ruby/models/jam_track_right_spec.rb
	ruby/spec/jam_ruby/models/jam_track_track_spec.rb
	ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
	web/app/assets/javascripts/download_jamtrack.js.coffee
	web/app/assets/javascripts/globals.js
	web/app/assets/javascripts/jam_rest.js
	web/app/assets/javascripts/order.js
	web/app/assets/javascripts/playbackControls.js
	web/app/assets/javascripts/session.js
	web/app/assets/stylesheets/client/session.css.scss
	web/app/controllers/api_jam_tracks_controller.rb
	web/app/controllers/api_recurly_controller.rb
	web/spec/controllers/api_jam_tracks_controller_spec.rb
2015-03-12 08:51:52 -05:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Seth Call be97555f1a * VRFS-2885 - check mixers from both modes 2015-03-05 09:47:33 -06:00
Seth Call aba4546e44 Squashed commit of the following:
* VRFS-2881 use backend audio source info in metronome
* VRFS-2832 add metronome play controls with mode control
* VRFS-2873 straighten out metronome names in frontend
* VRFS-2782 use getMyNetworkState for ntp_stable determination
* VRFS-2864 allow 'cluster' test, a new metronome mode
* VRFS-2861 metronome sounds not always matching frontend
* VRFS-2852 relax idea that only one person can open metronome
* VRFS-2865 metronome sounds not always matching frontend(dup)
* VRFS-2847 metronome volume now moves master and personal both
* VRFS-2835 metronome 'prevent' message is now dialog, not notify
* VRFS-2833 anyone can control volume/mute of metronome
* VRFS-2850 don't prevent metronome if solo session
2015-03-03 19:06:55 -06:00
Steven Miers 5396e66c67 Merge with develop 2015-02-27 11:51:45 -06:00
Seth Call 9415593244 * merged 2015-02-27 08:41:49 -06:00
Seth Call 8205b5ea58 * VRFS-2841 - load jmep into the backend 2015-02-27 08:37:12 -06:00
Seth Call 6b795695ee * VRFS-2753 - assign volume left over volume right to ensure both mono and stereo backend inputs get the data they need 2015-02-25 16:15:41 -06:00
Seth Call ca9e3706c7 * wip 2015-02-25 16:13:04 -06:00
Seth Call dbaeb8d996 merged 2015-02-25 10:43:21 -06:00
Seth Call 947d649f5f * VRFS-2831 - metronome showing 2015-02-24 17:16:12 -06:00
Seth Call a7824249a8 * VRFS-2826 - fix regression where remote peers couldn't see tracks 2015-02-23 22:29:28 -06:00
Seth Call d89e2f8e56 * VRFS-2818 - mute and volume faders control both mixer/personal simultaneously. more work required for moving of input tracks affecting backing tracks personal mix 2015-02-23 15:00:57 -06:00
Seth Call ae920c5a1a * stop play issued before close of backing track 2015-02-23 10:56:22 -06:00
Seth Call 1dbfdf0546 * VRFS-2811 - read loop state when drawing track 2015-02-23 10:45:10 -06:00
Seth Call 0472d6bc79 * VRFS-2686 - jamtrack sliders work 2015-02-20 11:55:49 -06:00
Seth Call 9d70400e91 * VRFS-2806 - disallow concurrent open of dialog 2015-02-20 09:50:03 -06:00
Seth Call 38849a1c44 VRFS-2804 - fix code to find the jamtrack ID correctly based on recent client changes 2015-02-19 15:56:42 -06:00
Seth Call 9345d65f06 * merged 2015-02-19 14:31:00 -06:00
Seth Call 85ffa2ec21 * VRFS-2802 - moving media files mixers in personal mode actually affect master mode now 2015-02-19 09:31:30 -06:00
Seth Call 23c7307c6f * VRFS-2796 - hide X for non openers 2015-02-18 15:41:51 -06:00
Seth Call b09825d188 * VRFS-2791 - unique-ify recorded backing track and backing track IDs 2015-02-18 10:16:47 -06:00
Seth Call c30d42c9dd * VRFS-2777 use SetSessionControlState to update loop info 2015-02-18 03:43:33 -06:00
Seth Call bdc1b898b4 * VRFS-2780 - styling complete; needs testing 2015-02-15 22:15:41 -06:00
Seth Call e40c964d97 * merged 2015-02-15 22:15:34 -06:00
Seth Call afe9f65709 * merged 2015-02-15 22:14:30 -06:00
Seth Call 42a2abe99c * merged 2015-02-15 22:01:06 -06:00
Seth Call 503e46ed74 *wip 2015-02-15 21:52:28 -06:00
Steven Miers c52c429e96 VRFS-2473 : Check ntp clock stability of all session participants before opening metronome. 2015-02-15 14:00:36 -06:00
Steven Miers bbce83984b VRFS-2498 : Fix spec. 2015-02-13 11:36:03 -06:00
Steven Miers 81dcd9bddc VRFS-2498 : Hook up new metronome sounds. Check group_id in lieu of media_type as it is not set for metronomes. 2015-02-12 14:05:25 -06:00
Steven Miers eff19235c3 VRFS-2730 : Hook up jamtrack looping. 2015-02-01 17:59:43 -06:00
Steven Miers a10078260a VRFS-2722 : Styling and logic necessary to display long labels on backing and other tracks. 2015-02-01 17:59:43 -06:00
Seth Call 8234c4c510 * VRFS-2726 - media_type is not set for develop builds of the client; so null means Recording in develop branch 2015-02-01 14:15:17 -06:00
Steven Miers d8c000c7f7 VRFS-2716 : Compare proper string for backing track type. Change a few client calls to correct function names. 2015-01-31 17:57:54 -06:00
Steven Miers a4d8ea5f60 VRFS-2498 : Fix tempo and sound strings for initial metronome opening. 2015-01-29 16:12:26 -06:00