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
..
common	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
dashboard	-top panel js regression fix. (Error when recording show	2011-05-17 14:55:37 -04:00
library	cc-2381: slow library searching speed	2011-06-17 14:41:57 -04:00
nowplaying	CC-1724:Phone home statistics	2011-06-20 17:58:38 -04:00
preferences	CC-1724:phone-home-statistics	2011-06-15 12:06:50 -04:00
schedule	CC-2289:Differentiate between time and duration	2011-06-13 12:59:44 -04:00
user	CC-2255: Separate user types admin and program manager	2011-06-07 14:31:39 -04:00