Naomi Aro 49474ab5c4 Merge branch '2.5.x' into 2.5.x-saas ... Conflicts: airtime_mvc/application/forms/AddShowWhen.php airtime_mvc/application/forms/LiveStreamingPreferences.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/views/scripts/form/preferences.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		2013-12-17 17:20:38 -05:00
..
css	CC-5648: Events are shifted down in the month view	2013-12-17 15:25:43 -05:00
images/datatables	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
install	CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.	2012-02-12 11:43:34 -05:00
js	Merge branch '2.5.x' into 2.5.x-saas	2013-12-17 17:20:38 -05:00
.htaccess	simplification of saas only code	2013-01-31 16:34:10 -05:00
favicon.ico	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
index.php	simplification of saas only code	2013-01-31 16:34:10 -05:00
robots.txt	CC-3933: Remove version number and date strings from login page footer, add robots.txt	2012-06-08 10:51:10 -04:00