Steven Miers 35ec59ff97 Merge branch 'develop' into feature/ratings		2015-07-21 16:56:40 -05:00
..
assets	* VRFS-3358 - UserMedia/MediaTrack group association corrected for the group controls of any media track	2015-07-21 16:12:04 -05:00
controllers	VRFS-3316 : Review cleanup, new tests	2015-07-21 16:55:40 -05:00
helpers	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
mailers	merging jam-web into web	2013-09-15 18:04:37 +00:00
responders	* the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks)	2013-12-30 18:34:15 +00:00
uploaders	VRFS-1193 fixed landing page promo buzz image display	2014-02-20 09:07:59 -06:00
views	* VRFS-3351 - advise users why they can't adjust volume remotely on media tracks	2015-07-21 14:26:03 -05:00