Daniel 1e4d34447a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ... Conflicts: airtime_mvc/application/models/Schedule.php		2012-03-13 10:23:44 -04:00
..
configs	CC-3403 : Replace Now Playing with the new Timeline screen	2012-03-12 14:23:03 +01:00
controllers	CC-3174 : showbuilder	2012-03-13 12:52:41 +01:00
forms	CC-733 : broadcast logs	2012-03-12 11:47:25 +01:00
layouts/scripts	CC-3403 : Replace Now Playing with the new Timeline screen	2012-03-12 14:23:03 +01:00
logging	CC-3404: Change "Now Playing" dashboard SQL query to take advantage of the "playout_status" field in the schedule table	2012-03-13 10:21:01 -04:00
models	Merge branch 'devel' of dev.sourcefabric.org:airtime into devel	2012-03-13 10:23:44 -04: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 '2.0.x' into devel	2012-03-12 17:52:17 -04:00
Bootstrap.php	CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)	2012-03-05 19:00:14 -05:00