Martin Konecny 272e428fa7 Merge branch '2.2.x' into 2.2.x-saas ... Conflicts: airtime_mvc/application/controllers/PreferenceController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/forms/EmailServerPreferences.php airtime_mvc/application/forms/GeneralPreferences.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/forms/Preferences.php airtime_mvc/application/forms/SupportSettings.php airtime_mvc/application/models/Schedule.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_livestream.phtml airtime_mvc/application/views/scripts/form/support-setting.phtml airtime_mvc/application/views/scripts/menu.phtml airtime_mvc/application/views/scripts/schedule/add- show-form.phtml		2012-11-06 17:23:32 -05:00
..
common	remove all mosty carriage return characters	2012-09-17 16:46:51 -04:00
configs	Aligned constants	2012-10-26 13:10:08 -04:00
controllers	Merge branch '2.2.x' into 2.2.x-saas	2012-11-06 17:23:32 -05:00
forms	Merge branch '2.2.x' into 2.2.x-saas	2012-11-06 17:23:32 -05:00
layouts/scripts	CC-3933: Remove version number and date strings from login page footer, add robots.txt	2012-06-08 10:51:10 -04:00
logging	Made Loggging::warn proper.	2012-09-11 14:34:03 -04:00
models	Merge branch '2.2.x' into 2.2.x-saas	2012-11-06 17:23:32 -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 '2.2.x' into 2.2.x-saas	2012-11-06 17:23:32 -05:00
Bootstrap.php	- live chat was appearing in smart block preview window	2012-10-24 10:46:34 -04:00