Albert Santoni 75914b791c Merge branch 'saas-dev' into saas ... Conflicts: airtime_mvc/application/common/FileDataHelper.php		2015-08-10 09:00:54 -04:00
..
airtime-recorder
api
audiopreview
billing	SAAS-973: Airtime Billing page - Add support for August promotion plans	2015-07-31 10:46:02 -04:00
dashboard
embed	SAAS-928: Time strings on Radio Page are not localized	2015-07-07 09:21:44 -04:00
embeddablewidgets	Tweaked layout of the embed widgets page	2015-06-11 14:30:52 -04:00
error	Merge branch 'saas-dev' into soundcloud	2015-06-17 10:14:03 -04:00
form	Clean up and bugfixes for password reset (SAAS-1009)	2015-08-07 13:57:42 -04:00
index	SAAS-939: Add option to preferences to display login button on radio page	2015-07-09 14:38:44 -04:00
library
listenerstat
login	More tweaks for password reset	2015-08-07 14:22:01 -04:00
partialviews	SAAS-994: The Scheduled Play switch should not be able to be turned off without a warning message	2015-08-06 11:14:43 -04:00
playlist	CC-6055: Improved escaping	2015-06-12 13:48:54 -04:00
playouthistory
playouthistorytemplate
plupload
preference	SAAS-876 - More work on stream settings page	2015-07-08 16:04:09 -04:00
recorder
schedule
showbuilder	Cleanup and comments for the timezone/language popup	2015-08-05 14:49:43 -04:00
systemstatus	Move misplaced tag	2015-06-18 10:03:12 -04:00
thank-you
user
webstream
menu.phtml