Paul Baranowski
|
d14dc6cbe3
|
Merge commit '08864f79347e912e990f5ce0e86e5a8e739dc29d'
Conflicts:
VERSION
airtime_mvc/application/configs/conf.php
airtime_mvc/application/models/Shows.php
|
2011-04-25 18:49:51 -04:00 |
|
Paul Baranowski
|
219598ac06
|
CC-2225 airtime-clean-storage doesnt work
Forced the user to run the script as superuser.
|
2011-04-25 18:34:03 -04:00 |
|
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 |
|
Paul Baranowski
|
07633ea249
|
CC-2225 airtime-clean-storage doesnt work
CC-2224 airtime-import checks if you can write to the stor directory even if you are linking
Had to rewrite the airtime-clean-storage script.
|
2011-04-25 16:48:34 -04:00 |
martin
|
7d2c2f65f2
|
-fix invalid path includes
|
2011-04-14 23:08:55 -04:00 |
|
martin
|
f108ac846f
|
CC-2058: Utilities are not in the system $PATH
-Added airtime-clean-storage and airtime-import symbolic links
|
2011-03-24 02:12:08 -04:00 |