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
|
4b7ea32c7d
|
-syntax errors discovered by eclipse
|
2011-04-21 17:23:59 -04:00 |
Naomi
|
23105b9d67
|
CC-2184 : Hardcoded CSS path should be relative path instead
using baseURL zend provides in path.
|
2011-04-18 11:02:09 -04:00 |
|
Naomi
|
b992801a45
|
hiding/showing show overflow message properly.
|
2011-04-15 12:11:06 -04:00 |
|
Naomi
|
eb312ae454
|
fixes to template, javascript to handle error arrays.
|
2011-04-15 10:51:06 -04:00 |
|
Naomi
|
c3a02e2569
|
some fixes to display rows in form.
|
2011-04-15 10:04:16 -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 |