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 |
martin
|
cfcd612d47
|
-updated version string to 1.9.0-beta
|
2011-04-22 01:02:35 -04:00 |
|
martin
|
34bd145885
|
-updated version string to remove beta
|
2011-04-18 17:32:49 -04:00 |
Naomi
|
9e96ec9da4
|
reloading config after ini values are changed
|
2011-04-18 15:28:48 -04:00 |
|
martin
|
d68a8369c8
|
-changed version string to "1.8.0-beta"
|
2011-04-14 23:11:40 -04:00 |
|
Paul Baranowski
|
b11cbd8159
|
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 |