Martin Konecny 5a83c5b81e Merge branch '1.9.1' into devel ... Conflicts: airtime_mvc/application/controllers/ScheduleController.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/models/StoredFile.php		2011-10-14 01:38:52 +02:00
..
plugins	CC-2833: Use ClassLoaders for PHP Files	2011-09-26 15:19:23 -04:00
ApiController.php	CC-2745: Show status of liquidsoap/icecast connection on Stream Settings	2011-10-10 20:14:27 -04:00
DashboardController.php	CC-2908: Add "Live Stream" title to live stream popup window	2011-10-04 17:18:36 -04:00
ErrorController.php	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
IndexController.php	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
LibraryController.php	Merge branch '1.9.1' into devel	2011-10-14 01:38:52 +02:00
LoginController.php	CC-2807: Remove AIRTIME_VERSION from constants.php and use the value in the database instead	2011-09-23 16:26:19 -04:00
NowplayingController.php	CC-2833: Use ClassLoaders for PHP Files	2011-09-23 17:00:55 -04:00
PlaylistController.php	CC-2833: Use ClassLoaders for PHP Files	2011-09-22 12:24:17 -04:00
PluploadController.php	CC-2833: Use ClassLoaders for PHP Files	2011-09-22 12:24:17 -04:00
PreferenceController.php	CC-2745: Show status of liquidsoap/icecast connection on	2011-10-13 14:22:28 -04:00
ScheduleController.php	Merge branch '1.9.1' into devel	2011-10-14 01:38:52 +02:00
SearchController.php	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
SystemstatusController.php	CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder	2011-09-28 12:45:19 -04:00
UserController.php	CC-2833: Use ClassLoaders for PHP Files	2011-09-23 17:00:55 -04:00