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
This commit is contained in:
commit
eb76bbe7f0
17 changed files with 254 additions and 129 deletions
|
@ -8,6 +8,7 @@ if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
|
|||
echo "400 Not executable\r\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
set_include_path('/var/www/airtime/library' . PATH_SEPARATOR . get_include_path());
|
||||
set_include_path('/var/www/airtime/application/models' . PATH_SEPARATOR . get_include_path());
|
||||
require_once('/var/www/airtime/application/configs/conf.php');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue