Albert Santoni bb21f08d87 Merge branch '2.5.x' into saas ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/models/Auth.php		2014-06-25 11:18:56 -04:00
..
common	CC-5627 : Check all Application_Common_DateHelper calculations that use	2013-12-12 13:28:51 -05:00
configs	Remove database credentials from application.ini	2014-05-02 15:50:37 -04:00
controllers	Merge branch '2.5.x' into saas	2014-06-25 11:18:56 -04:00
forms	Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas	2014-05-26 19:11:47 -04:00
layouts/scripts	Added GTM code and data layer	2014-06-11 13:24:03 -04:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch '2.5.x' into saas	2014-06-25 11:18:56 -04:00
modules/rest	Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas	2014-06-11 13:35:34 -04:00
services	CC-5634: Can add/remove content to a linked show while one instance is currently playing	2014-06-09 12:07:27 -04:00
validate	Fix SAAS-349 by preventing password changes in demo mode.	2013-09-26 16:23:22 -04:00
views	'My Account' link on free trial box was broken	2014-06-12 09:37:16 -04:00
Bootstrap.php	Merge branch '2.5.x' into saas	2014-06-25 11:18:56 -04:00