Naomi Aro 42452b8ea9 Merge branch 'CC-3174' into devel ... Conflicts: airtime_mvc/application/Bootstrap.php airtime_mvc/application/controllers/LibraryController.php airtime_mvc/application/controllers/PlaylistController.php airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/models/Playlist.php airtime_mvc/application/models/StoredFile.php airtime_mvc/public/js/airtime/library/spl.js		2012-02-06 11:07:10 +01:00
..
configs	Merge branch 'CC-3174' into devel	2012-02-06 11:07:10 +01:00
controllers	Merge branch 'CC-3174' into devel	2012-02-06 11:07:10 +01:00
forms	CC-2065: Fade times longer than Airtime supports can be set in Playlist Builder and Preferences	2012-02-02 14:44:14 -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 'CC-3174' into devel	2012-02-06 11:07:10 +01: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 'CC-3174' into devel	2012-02-06 11:07:10 +01:00
Bootstrap.php	Merge branch 'CC-3174' into devel	2012-02-06 11:07:10 +01:00