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
..
ACL.php	CC-3174 Show Builder	2012-01-16 09:56:57 +01:00
airtime-conf-production.php	-various optimizations	2012-01-09 17:47:58 -05:00
airtime-conf.php	CC-2591: Allow upload of any audio clip to Soundcloud	2011-09-22 11:47:24 -04:00
application.ini	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
classmap-airtime-conf.php	CC-3110 : Password reset	2011-12-21 16:01:29 -08:00
conf.php	SAAS-155: Add possibility to show additional information on	2012-01-17 14:47:26 -05:00
constants.php	CC-2873: Soundcloud plugin doesn't log any error when there is an	2011-10-03 17:38:57 -04:00
navigation.php	CC-3174 : showbuilder	2012-02-05 18:19:22 +01:00