Jonathan Kolyer eb98b97cd5 merge conflict		2014-03-07 06:53:35 +00:00
..
assets	merge conflict	2014-03-07 06:53:35 +00:00
controllers	merge conflict	2014-03-07 06:53:35 +00:00
helpers	* VRFS-1285 - hide play button if it can't be played, and show BROADCASTING OFFLINE or PRIVATE SESSION appropriaely	2014-03-04 00:00:01 -06: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-1052 fix timestamp issue with notifications (moved to timeago plugin)	2014-03-07 01:30:23 -05:00