Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas ... Conflicts: airtime_mvc/application/forms/AddShowWhen.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/application/views/scripts/form/preferences_livestream.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/application/views/scripts/schedule/add-show-form.phtml		2013-12-17 17:20:38 -05:00
..
common	CC-5627 : Check all Application_Common_DateHelper calculations that use	2013-12-12 13:28:51 -05:00
configs	Merge branch '2.4.x' into ryerson-history	2013-08-30 16:07:41 -04:00
controllers	Merge branch '2.5.x' into 2.5.x-saas	2013-12-17 17:20:38 -05:00
forms	Merge branch '2.5.x' into 2.5.x-saas	2013-12-17 17:20:38 -05:00
layouts/scripts	CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window.	2013-12-16 17:14:00 -05:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch '2.5.x' into 2.5.x-saas	2013-12-17 17:20:38 -05:00
services	CC-5640: End time does not get updated when editing the current playing show	2013-12-16 15:27:51 -05:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	Merge branch '2.5.x' into 2.5.x-saas	2013-12-17 17:20:38 -05:00
Bootstrap.php	Merge branch '2.5.x' into 2.5.x-saas	2013-12-17 17:20:38 -05:00