Martin Konecny 54cbc86a0a Merge branch '2.0.x' into devel ... Conflicts: VERSION airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/models/Nowplaying.php airtime_mvc/application/models/Show.php airtime_mvc/application/models/airtime/CcShowInstances.php		2012-02-14 14:47:07 -05:00
..
configs	Merge branch '2.0.x' into devel	2012-02-14 14:47:07 -05:00
controllers	Merge branch '2.0.x' into devel	2012-02-14 14:47:07 -05:00
forms	Merge branch '2.0.x' into devel	2012-02-14 14:47:07 -05:00
layouts/scripts	Merge branch 'CC-3174' into devel	2012-02-06 11:07:10 +01:00
logging	CC-3153: When cancelling a show that is currently on-air, the show-instance is not removed.	2011-12-02 16:22:54 -05:00
models	Merge branch '2.0.x' into devel	2012-02-14 14:47:07 -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	CC-3174 : showbuilder	2012-02-09 23:41:12 +01:00
Bootstrap.php	Merge branch '2.0.x' into devel	2012-02-14 14:47:07 -05:00