diff options
| -rw-r--r-- | apps/comments/css/comments.css | 9 | ||||
| -rw-r--r-- | apps/comments/js/commentstabview.js | 2 | ||||
| -rw-r--r-- | build/license.php | 2 | ||||
| -rw-r--r-- | lib/private/App/CodeChecker/InfoChecker.php | 4 | ||||
| -rw-r--r-- | lib/private/Server.php | 8 |
5 files changed, 9 insertions, 16 deletions
diff --git a/apps/comments/css/comments.css b/apps/comments/css/comments.css index d33ce735448..7f64f1cf7db 100644 --- a/apps/comments/css/comments.css +++ b/apps/comments/css/comments.css @@ -60,14 +60,7 @@ } #commentsTabView .comment.collapsed .message { - white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ - white-space: -webkit-pre-wrap; /*Chrome & Safari */ - white-space: -pre-wrap; /* Opera 4-6 */ - white-space: -o-pre-wrap; /* Opera 7 */ - white-space: pre-wrap; /* css-3 */ - word-wrap: break-word; /* Internet Explorer 5.5+ */ - word-break: break-all; - white-space: normal; + white-space: pre-wrap; } #commentsTabView .comment.collapsed .message { diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js index 565f6a99296..9451e828f91 100644 --- a/apps/comments/js/commentstabview.js +++ b/apps/comments/js/commentstabview.js @@ -32,7 +32,7 @@ '{{/if}}' + ' </div>' + ' <form class="newCommentForm">' + - ' <input type="text" class="message" placeholder="{{newMessagePlaceholder}}" value="{{{message}}}"" />' + + ' <input type="text" class="message" placeholder="{{newMessagePlaceholder}}" value="{{{message}}}" />' + ' <input class="submit icon-confirm" type="submit" value="" />' + '{{#if isEditMode}}' + ' <input class="cancel pull-right" type="button" value="{{cancelText}}" />' + diff --git a/build/license.php b/build/license.php index 5ada91a0f33..3f1fe41764a 100644 --- a/build/license.php +++ b/build/license.php @@ -189,7 +189,7 @@ With help from many libraries and frameworks including: while(!empty($lines)) { $line = $lines[0]; array_shift($lines); - if (strpos($line, 'ownCloud, Inc') !== false) { + if (strpos($line, 'ownCloud, Inc') !== false || strpos($line, 'ownCloud GmbH') !== false) { return true; } } diff --git a/lib/private/App/CodeChecker/InfoChecker.php b/lib/private/App/CodeChecker/InfoChecker.php index 3ee99dc6478..77bf7e8182d 100644 --- a/lib/private/App/CodeChecker/InfoChecker.php +++ b/lib/private/App/CodeChecker/InfoChecker.php @@ -80,7 +80,7 @@ class InfoChecker extends BasicEmitter { $info = $this->infoParser->parse($appPath . '/appinfo/info.xml'); - if (isset($info['dependencies']['owncloud']['@attributes']['min-version']) && ($info['requiremin'] || $info['require'])) { + if (isset($info['dependencies']['owncloud']['@attributes']['min-version']) && (isset($info['requiremin']) || isset($info['require']))) { $this->emit('InfoChecker', 'duplicateRequirement', ['min']); $errors[] = [ 'type' => 'duplicateRequirement', @@ -90,7 +90,7 @@ class InfoChecker extends BasicEmitter { $this->emit('InfoChecker', 'missingRequirement', ['min']); } - if (isset($info['dependencies']['owncloud']['@attributes']['max-version']) && $info['requiremax']) { + if (isset($info['dependencies']['owncloud']['@attributes']['max-version']) && isset($info['requiremax'])) { $this->emit('InfoChecker', 'duplicateRequirement', ['max']); $errors[] = [ 'type' => 'duplicateRequirement', diff --git a/lib/private/Server.php b/lib/private/Server.php index 44fc605826c..eb49155adef 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -1397,7 +1397,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCA\Files_External\Service\BackendService */ public function getStoragesBackendService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\BackendService'); + return $this->query('OCA\\Files_External\\Service\\BackendService'); } /** @@ -1406,7 +1406,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCA\Files_External\Service\GlobalStoragesService */ public function getGlobalStoragesService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\GlobalStoragesService'); + return $this->query('OCA\\Files_External\\Service\\GlobalStoragesService'); } /** @@ -1415,7 +1415,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCA\Files_External\Service\UserGlobalStoragesService */ public function getUserGlobalStoragesService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserGlobalStoragesService'); + return $this->query('OCA\\Files_External\\Service\\UserGlobalStoragesService'); } /** @@ -1424,7 +1424,7 @@ class Server extends ServerContainer implements IServerContainer { * @return \OCA\Files_External\Service\UserStoragesService */ public function getUserStoragesService() { - return \OC_Mount_Config::$app->getContainer()->query('OCA\\Files_External\\Service\\UserStoragesService'); + return $this->query('OCA\\Files_External\\Service\\UserStoragesService'); } /** |