Albert Santoni 230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: CREDITS		2015-01-22 11:29:38 -05:00
..
common	cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function	2015-01-09 13:02:25 -05:00
configs	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2015-01-22 11:29:38 -05:00
controllers	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2015-01-22 11:29:38 -05:00
forms	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2015-01-22 11:29:38 -05:00
layouts/scripts	String updates	2014-11-14 10:01:06 -05:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2015-01-22 11:29:38 -05:00
modules/rest	Moved REST authorization boilerplate to Zend Acl_plugin	2015-01-21 17:20:04 -05:00
services	SAAS-551: Cannot schedule shows due to overlapping show check bug	2015-01-20 11:32:15 -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 cc-5709-airtime-analyzer	2015-01-22 11:29:38 -05:00
Bootstrap.php	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2015-01-22 11:29:38 -05:00