denise 7d8079f770 Merge branch '2.2.x' into devel ... Conflicts: airtime_mvc/application/controllers/ShowbuilderController.php airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js airtime_mvc/public/js/airtime/common/common.js		2012-10-19 12:50:36 -04:00
..
common	CC-2184: Hardcoded CSS path should be relative path instead	2012-10-19 11:09:34 -04:00
configs	cc-3936: added warning for metadata attributes that are not defined in constants.php	2012-08-27 14:03:22 -04:00
controllers	Merge branch '2.2.x' into devel	2012-10-19 12:50:36 -04:00
forms	Merge branch '2.2.x' into devel	2012-10-19 12:50:36 -04:00
layouts/scripts	CC-2184: Hardcoded CSS path should be relative path instead	2012-10-19 11:09:34 -04:00
logging	Made Loggging::warn proper.	2012-09-11 14:34:03 -04:00
models	Merge branch '2.2.x' into devel	2012-10-19 12:50:36 -04:00
validate	CC-2166: Packaging Improvements. Moved the Zend app into airtime_mvc. It is now installed to /var/www/airtime. Storage is now set to /srv/airtime/stor. Utils are now installed to /usr/lib/airtime/utils/. Added install/airtime-dircheck.php as a simple test to see if everything is install/uninstalled correctly.	2011-04-14 18:55:04 -04:00
views	Merge branch '2.2.x' into devel	2012-10-19 12:50:36 -04:00
Bootstrap.php	Merge branch '2.2.x' into devel	2012-10-19 12:50:36 -04:00