Commit Graph

932 Commits

Author SHA1 Message Date
Seth Call 76adc44a50 * wip 2014-11-17 17:16:30 -06:00
Seth Call b780b4a462 * merged 2014-11-17 13:32:13 -06:00
Seth Call d1d059b4c5 * disable score_histories for now 2014-11-17 13:28:43 -06:00
Steven Miers b01b3ecd7d VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge. 2014-11-16 16:23:31 -06:00
Brian Smith d65358cea6 VRFS-2442 suppress "Recurs once..." text for non-recurring sessions 2014-11-15 13:01:28 -05:00
Brian Smith 118ed7c39c undo last change re: other instrument id 2014-11-15 11:59:51 -05:00
Brian Smith 12ca12f3cf Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-15 11:33:43 -05:00
Brian Smith 8707bb2f16 set instrument ID for unstructured rsvp 2014-11-15 11:33:26 -05:00
Seth Call 92b617898f * VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality 2014-11-14 20:47:56 -06:00
Seth Call 6277708bb4 VRFS-1491 - create personal/master mix toggle, and beef up user.mods 2014-11-11 16:21:46 -06:00
Seth Call c3cd742c17 * wip 2014-11-11 16:21:29 -06:00
Steven Miers 6c825db79f Merge update 2014-11-10 17:10:01 -06:00
Seth Call 4e00863de6 * merged 2014-11-07 16:16:25 -06:00
Seth Call 8cad33a303 * recording file/manager fixes and aging of recordings 2014-11-07 16:12:36 -06:00
Brian Smith c6bfd59999 VRFS-2462 fixed session count on musician hover bubble 2014-11-07 13:05:07 -05:00
Seth Call 164fe8db61 * recording cleanup logic VRFS-2393 2014-11-06 11:26:13 -06:00
Seth Call ea601711fa * make desk keys configurable 2014-11-05 20:32:37 -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 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
Seth Call ace7ac15c8 * VRFS-2432 notify when stream mix is done 2014-11-03 10:00:42 -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
Brian Smith 33a431f822 VRFS-2427 fixed broken test 2014-11-02 14:26:56 -05:00
Brian Smith eb56be97dd VRFS-2427 fix sorting / paging issue on Feeds screen 2014-11-02 12:57:43 -05: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
Brian Smith a310c46288 Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-29 20:41:05 -04:00
Seth Call 4ee75adcf2 * make intermediary mp3 higher bitrate 2014-10-29 13:51:33 -05:00
Seth Call 62833198b3 * VRFS-2431 - run normalize-ogg and normalize-mp3 to bump up master mix 2014-10-29 11:28:13 -05:00
Seth Call 149967f877 * VRFS-2375 - share button works now in master mix complete msg 2014-10-29 10:27:29 -05:00
Seth Call 28e752629a * show private recording on recording landing page to someone who was in the session 2014-10-29 07:22:45 -05:00
Brian Smith 6d8ec70087 VRFS-2401 text links in emails should be yellow 2014-10-29 07:12:43 -04:00
Brian Smith 300bc2cd82 Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-27 21:37:28 -04:00
Seth Call 53706aec71 * VRFS-2405 - cleanup more files in audiomixer, and input/output files in quickmixer 2014-10-27 17:52:56 -05:00
Seth Call 004674c562 * VRFS-2405 - cleanup files after successful audiomix 2014-10-27 17:49:14 -05:00
Seth Call 5f87fdab00 * bah adding junk to AudioMixer file 2014-10-27 13:51:29 -05:00
Seth Call bbff3ccab5 * remove debug print 2014-10-27 13:50:44 -05:00
Seth Call 970401374b * VRFS-2399 - fixed recording sync track issue 2014-10-27 12:42:30 -05:00
Brian Smith 709150edac Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-26 12:41:17 -04:00
Brian Smith c57ea372ac VRFS-2311 allow session creator to add and approve slots on the fly when there are no available slots 2014-10-25 22:23:52 -04:00
Seth Call 68b9008ba8 * fix wrong class name in AudioMixerRetry 2014-10-25 11:35:59 -05:00
Seth Call 58d96fc171 * VRFS-2192 - export recording button added to file sync dialog 2014-10-23 16:45:25 -05:00
Seth Call fe7edbba5d * many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181 2014-10-22 23:10:49 -05:00
Brian Smith d8a8a0d33b remove byebug reference 2014-10-21 19:51:55 -04:00
Jonathan Kolyer af2159fe72 VRFS-1945 added create_type to music_sessions; filtering session search based on create_type 2014-10-21 07:27:26 +00:00
Brian Smith a8987efaa1 VRFS-2337 added latency badge to musician hover bubble 2014-10-19 21:18:05 -04:00
Steven Miers cce9fc1577 VRFS-2029 : Fix issue where a nil (instead of false)
is causing claimed_recording not to save properly.
2014-10-15 17:59:59 -05:00
Steven Miers c1f2a2083f VRFS-2029 : Update REST API ApiRecordingsController#claim
to accept and distribute upload_to_youtube flag as appropriate.  Spec
to verify.
2014-10-15 13:54:10 -05:00
Steven Miers d95a063648 VRFS-2029 : Rails model attribute for upload_to_youtube flag
Also includes Rails validation.
2014-10-15 13:45:30 -05:00
Steven Miers 5691fbc51f Require new scheduled_music_session_cleaner at class level.
Fixes broken unit test.
2014-10-14 14:54:18 -05:00