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
..
application	Merge branch '2.0.x' into devel	2012-03-12 17:52:17 -04:00
build	CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table	2012-03-02 12:22:08 +01:00
library	CC-3297: Depend on zendframework and php-pear as external packages	2012-02-06 20:28:38 -05:00
public	Merge branch '2.0.x' into devel	2012-03-12 17:52:17 -04:00
tests	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