diff options
| -rw-r--r-- | apps/user_webdavauth/appinfo/info.xml | 6 | ||||
| -rwxr-xr-x | autotest.sh | 4 | ||||
| -rw-r--r-- | core/command/app/checkcode.php | 1 | ||||
| -rw-r--r-- | core/css/apps.css | 2 | ||||
| -rw-r--r-- | lib/private/mimetypes.list.php | 4 | ||||
| -rw-r--r-- | lib/private/setup.php | 18 |
6 files changed, 24 insertions, 11 deletions
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml index abbf79131b5..755a6d5bfb4 100644 --- a/apps/user_webdavauth/appinfo/info.xml +++ b/apps/user_webdavauth/appinfo/info.xml @@ -1,10 +1,10 @@ <?xml version="1.0"?> <info> <id>user_webdavauth</id> - <name>WebDAV user backend</name> - <description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other webserver to authenticate. It should return http 200 for right credentials and http 401 for wrong ones. + <name>User backend using remote HTTP servers</name> + <description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other web server to authenticate. It should return http 200 for right credentials and http 401 for wrong ones. - Attention: This app is not compatible with the LDAP user and group backend. This app is not the webdav interface of ownCloud, if you don't understand what it does then do not enable it.</description> + Attention: This app is not compatible with the LDAP user and group backend. This app is not the WebDAV interface of ownCloud, if you don't understand what it does then do not enable it.</description> <licence>AGPL</licence> <author>Frank Karlitschek</author> <requiremin>4.93</requiremin> diff --git a/autotest.sh b/autotest.sh index 8e99c8f0ca9..46c55edef19 100755 --- a/autotest.sh +++ b/autotest.sh @@ -152,8 +152,8 @@ function execute_tests { DOCKER_CONTAINER_ID=$(docker run -d deepdiver/docker-oracle-xe-11g) DATABASEHOST=$(docker inspect "$DOCKER_CONTAINER_ID" | grep IPAddress | cut -d '"' -f 4) - echo "Waiting 60 seconds for Oracle initialization ... " - sleep 60 + echo "Waiting 120 seconds for Oracle initialization ... " + sleep 120 DATABASEUSER=autotest DATABASENAME='XE' diff --git a/core/command/app/checkcode.php b/core/command/app/checkcode.php index 6d10714d410..9e5514429ff 100644 --- a/core/command/app/checkcode.php +++ b/core/command/app/checkcode.php @@ -73,6 +73,7 @@ class CheckCode extends Command { $output->writeln('<info>App is compliant - awesome job!</info>'); } else { $output->writeln('<error>App is not compliant</error>'); + return 1; } } } diff --git a/core/css/apps.css b/core/css/apps.css index 57133729f15..af2e85e3b9b 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -410,6 +410,7 @@ position: relative; height: 100%; overflow-y: auto; + z-index: 100; } #app-content-wrapper { @@ -555,4 +556,3 @@ em { z-index:500; padding:16px; } - diff --git a/lib/private/mimetypes.list.php b/lib/private/mimetypes.list.php index e2b82b256e5..5f222cbd835 100644 --- a/lib/private/mimetypes.list.php +++ b/lib/private/mimetypes.list.php @@ -117,6 +117,8 @@ return array( 'mpg' => array('video/mpeg', null), 'mpo' => array('image/jpeg', null), 'msi' => array('application/x-msi', null), + 'mts' => ['video/MP2T', null], + 'mt2s' => ['video/MP2T', null], 'nef' => array('image/x-dcraw', null), 'numbers' => array('application/x-iwork-numbers-sffnumbers', null), 'odf' => array('application/vnd.oasis.opendocument.formula', null), @@ -176,7 +178,7 @@ return array( 'wav' => array('audio/wav', null), 'webm' => array('video/webm', null), 'woff' => array('application/font-woff', null), - 'wmv' => array('video/x-ms-asf', null), + 'wmv' => array('video/x-ms-wmv', null), 'xcf' => array('application/x-gimp', null), 'xla' => array('application/vnd.ms-excel', null), 'xlam' => array('application/vnd.ms-excel.addin.macroEnabled.12', null), diff --git a/lib/private/setup.php b/lib/private/setup.php index 7ca30e172ec..1ffe074dc34 100644 --- a/lib/private/setup.php +++ b/lib/private/setup.php @@ -402,10 +402,20 @@ class Setup { throw new \OC\HintException('.htaccess file has the wrong version. Please upload the correct version. Maybe you forgot to replace it after updating?'); } - $content = "\n"; - $content.= "ErrorDocument 403 ".\OC::$WEBROOT."/core/templates/403.php\n";//custom 403 error page - $content.= "ErrorDocument 404 ".\OC::$WEBROOT."/core/templates/404.php";//custom 404 error page - @file_put_contents($setupHelper->pathToHtaccess(), $content, FILE_APPEND); //suppress errors in case we don't have permissions for it + $htaccessContent = file_get_contents($setupHelper->pathToHtaccess()); + $content = ''; + if (strpos($htaccessContent, 'ErrorDocument 403') === false) { + //custom 403 error page + $content.= "\nErrorDocument 403 ".\OC::$WEBROOT."/core/templates/403.php"; + } + if (strpos($htaccessContent, 'ErrorDocument 404') === false) { + //custom 404 error page + $content.= "\nErrorDocument 404 ".\OC::$WEBROOT."/core/templates/404.php"; + } + if ($content !== '') { + //suppress errors in case we don't have permissions for it + @file_put_contents($setupHelper->pathToHtaccess(), $content . "\n", FILE_APPEND); + } } public static function protectDataDirectory() { |