Seth Call bfe302b2f1 * merged		2015-03-24 14:43:48 -05:00
..
admin	* merged develop	2015-03-24 11:27:26 -05:00
assets	VRFS-2916 formatting, added jam_track_played placeholders	2015-03-19 06:07:43 +00:00
controllers	* VRFS-2839 - add check to admin	2015-02-25 22:05:18 -06:00
helpers	* icecast working locally on my mac (VRFS-1002)	2014-01-21 14:51:03 +00:00
mailers	merging jam-admin into admin	2013-09-16 03:15:31 +00:00
models	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
uploaders	* VRFS-1089 - jamadmin creation of recordings done	2014-02-13 16:41:50 +00:00
views	* merged develop	2015-03-24 11:27:26 -05:00