denise 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime ... Conflicts: airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js		2012-11-21 11:44:40 -05:00
..
common	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
configs	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
controllers	Merge branch 'devel' into cc-1960-internationalize-airtime	2012-11-21 11:44:40 -05:00
forms	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
layouts/scripts	CC-1960: Internationalize Airtime / Support translations	2012-11-20 11:33:37 -05:00
logging	Made Loggging::warn proper.	2012-09-11 14:34:03 -04:00
models	Merge branch 'devel' into cc-1960-internationalize-airtime	2012-11-21 11:44:40 -05: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 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime	2012-11-20 16:56:18 -05:00
Bootstrap.php	CC-1960: Internationalize Airtime / Support translations	2012-11-20 16:40:02 -05:00