Martin Konecny 6f270bfb3d Merge branch '2.0.x' into devel ... Conflicts: VERSION airtime_mvc/application/models/Schedule.php airtime_mvc/application/models/Show.php airtime_mvc/public/js/airtime/dashboard/helperfunctions.js install_minimal/include/airtime-constants.php python_apps/api_clients/api_client.py python_apps/pypo/pypocli.py python_apps/pypo/pypofetch.py		2012-03-12 17:52:17 -04:00
..
css	CC-733 : playout history	2012-03-09 11:13:32 +01: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.0.x' into devel	2012-03-12 17:52:17 -04:00
.htaccess	CC-3331 : Optimize "Now Playing" to load in less than 1/2 second	2012-02-17 11:13:34 -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	CC-3320: Upgrade from 2.0->2.0.1: Airtime instance is not avaiable for 1~2mins right after upgrade.	2012-02-12 15:31:17 -05:00