drigato f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer ... Conflicts: airtime_mvc/application/Bootstrap.php		2014-11-26 10:35:48 -05:00
..
common	Added live-info-v2 and station metadata api calls	2014-10-24 15:11:27 -04:00
configs	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-11-26 10:35:48 -05:00
controllers	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-11-26 10:35:48 -05:00
forms	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-11-26 10:35:48 -05:00
layouts/scripts	Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.	2014-11-06 18:39:48 -05:00
logging	CC-5062:	2013-04-19 20:11:33 -04:00
models	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-11-26 10:35:48 -05:00
modules/rest	Remove clearAction from the media REST API for security	2014-11-20 16:47:02 -05:00
services	Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change	2014-11-05 10:06:59 -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	2014-11-26 10:35:48 -05:00
Bootstrap.php	Merge branch '2.5.x' into cc-5709-airtime-analyzer	2014-11-26 10:35:48 -05:00