Martin Konecny 8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/forms/AddShowWhen.php airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/forms/SoundcloudPreferences.php airtime_mvc/application/forms/SupportSettings.php airtime_mvc/application/views/scripts/form/preferences.phtml airtime_mvc/application/views/scripts/form/preferences_email_server.phtml airtime_mvc/application/views/scripts/form/preferences_general.phtml airtime_mvc/application/views/scripts/form/preferences_livestream.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/application/views/scripts/schedule/add- show-form.phtml airtime_mvc/public/js/airtime/preferences/preferences.js python_apps/api_clients/api_client.py python_apps/pypo/listenerstat.py		2013-01-15 13:44:44 -05:00
..
common	CC-2184: Hardcoded CSS path should be relative path instead	2013-01-14 16:00:38 -05:00
configs	- CRLF fix	2013-01-14 16:21:02 -05:00
controllers	Merge branch 'devel' into 2.3.x-saas	2013-01-15 13:44:44 -05:00
forms	Merge branch 'devel' into 2.3.x-saas	2013-01-15 13:44:44 -05:00
layouts/scripts	CC-2184: Hardcoded CSS path should be relative path instead	2013-01-14 16:00:38 -05:00
logging	Made Loggging::warn proper.	2012-09-11 14:34:03 -04:00
models	Merge branch 'devel' into 2.3.x-saas	2013-01-15 13:44:44 -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 'devel' into 2.3.x-saas	2013-01-15 13:44:44 -05:00
Bootstrap.php	Merge branch 'devel' into 2.3.x-saas	2013-01-15 13:44:44 -05:00