James f855da0f45 Merge branch '1.9.1' into devel ... Conflicts: VERSION airtime_mvc/application/configs/constants.php airtime_mvc/application/configs/navigation.php install_minimal/DoctrineMigrations/Version20110711161043.php python_apps/api_clients/api_client.py		2011-08-18 19:05:13 -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	cc-2683: not using utc time	2011-08-16 15:07:55 -04:00
library	CC-2651: import idicator	2011-08-09 10:40:10 -04:00
nowplaying	CC-2460:Popup shouldn't show after X is pressed	2011-07-06 17:02:58 -04:00
preferences	Merge branch '1.9.1' into devel	2011-08-18 19:05:13 -04:00
schedule	CC-2379: "Add Show" uses browser time instead of server time	2011-08-18 15:44:16 -04:00
user	CC-2468:Manage Users Say DJ and add show says host	2011-06-29 16:33:20 -04:00