Paul Baranowski eb76bbe7f0 Merge branch 'master' of dev.sourcefabric.org:airtime ... Conflicts: VERSION airtime_mvc/application/configs/conf.php airtime_mvc/application/models/Playlist.php airtime_mvc/application/models/Schedule.php airtime_mvc/application/models/Shows.php airtime_mvc/application/models/StoredFile.php airtime_mvc/application/views/scripts/form/preferences_general.phtml airtime_mvc/application/views/scripts/user/remove-user.phtml airtime_mvc/public/js/airtime/schedule/add-show.js airtime_mvc/public/js/airtime/schedule/schedule.js install/airtime-upgrade.php install/include/AirtimeInstall.php python_apps/api_clients/api_client.py utils/airtime-clean-storage utils/airtime-clean-storage.php utils/airtime-import utils/airtime-import.php		2011-04-25 17:24:53 -04:00
..
DoctrineMigrations	testing if the column has wrong type, if so replacing it.	2011-04-07 15:28:29 -04:00
include	Merge branch 'master' of dev.sourcefabric.org:airtime	2011-04-25 17:24:53 -04:00
upgrades	CC-2186: Integration of a logger tool	2011-04-20 16:22:06 -04:00
airtime-dircheck.php	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
airtime-install.php	CC-2186: Integration of a logger tool	2011-04-20 00:46:03 -04:00
airtime-uninstall.php	CC-2186: Integration of a logger tool	2011-04-20 00:46:03 -04:00
airtime-upgrade.php	CC-2186: Integration of a logger tool	2011-04-20 16:22:06 -04:00
airtime-user.php	CC-2149: Adjustments for DEB packaging	2011-04-13 12:07:00 -04:00
index.php	CC-1971	2011-02-22 18:22:31 +01:00
install_twitter_plugin.php	CC-1971	2011-02-22 18:22:31 +01:00
pg_hba.conf	Minor fixes for the name change Campcaster -> Airtime.	2011-01-07 17:17:23 -05:00
uninstall_twitter_plugin.php	CC-1971	2011-02-22 18:22:31 +01:00