james 05dc48fa71 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel ...

Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/Preference.php

2011-06-20 18:09:37 -04:00

..

configs

CC-1799 Put Airtime Storage into a Human Readable File Naming Convention

2011-06-15 14:20:14 +02:00

controllers

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2011-06-20 18:09:37 -04:00

forms

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2011-06-20 18:09:37 -04:00

layouts/scripts

CC-2294:Switch left/right orientation of playlist builder

2011-06-01 10:17:47 -04:00

logging

CC-2186: Integration of a logger tool

2011-04-20 00:46:03 -04:00

models

Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

2011-06-20 18:09:37 -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 'devel' of dev.sourcefabric.org:airtime into devel

2011-06-20 18:09:37 -04:00

Bootstrap.php

cc-2167-top-panel-doesn't-list-recording-shows

2011-05-10 19:06:35 -04:00