diff options
| -rw-r--r-- | apps/files_external/lib/Lib/Storage/Swift.php | 2 | ||||
| -rw-r--r-- | apps/theming/css/theming.scss | 20 | ||||
| -rw-r--r-- | core/Migrations/Version13000Date20170718121200.php | 25 | ||||
| -rw-r--r-- | core/Migrations/Version13000Date20170814074715.php | 78 | ||||
| -rw-r--r-- | core/css/header.scss | 5 | ||||
| -rw-r--r-- | core/templates/loginflow/authpicker.php | 6 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_classmap.php | 1 | ||||
| -rw-r--r-- | lib/composer/composer/autoload_static.php | 1 | ||||
| -rw-r--r-- | settings/css/settings.css | 4 |
9 files changed, 137 insertions, 5 deletions
diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php index 57df4aa01a5..4dc6ff37b19 100644 --- a/apps/files_external/lib/Lib/Storage/Swift.php +++ b/apps/files_external/lib/Lib/Storage/Swift.php @@ -276,7 +276,7 @@ class Swift extends \OC\Files\Storage\Common { /** @var OpenCloud\ObjectStore\Resource\DataObject $object */ foreach ($objects as $object) { $file = basename($object->getName()); - if ($file !== basename($path)) { + if ($file !== basename($path) && $file !== '.') { $files[] = $file; } } diff --git a/apps/theming/css/theming.scss b/apps/theming/css/theming.scss index 77fc6f70200..252d009289e 100644 --- a/apps/theming/css/theming.scss +++ b/apps/theming/css/theming.scss @@ -116,3 +116,23 @@ input.primary { } } } + +@if ($color-primary == #ffffff) { + /* show grey border below header */ + #body-user #header, + #body-settings #header, + #body-public #header { + border-bottom: 1px solid #ebebeb; + } + + /* show triangle in header in grey */ + #appmenu li a.active:before, + .header-right #settings #expand:before { + border-bottom-color:#ebebeb; + } + + /* show border around quota bar in files app */ + .app-files #quota .quota-container { + border: 1px solid #ebebeb; + } +} diff --git a/core/Migrations/Version13000Date20170718121200.php b/core/Migrations/Version13000Date20170718121200.php index 81743bd203f..4e61e3e2814 100644 --- a/core/Migrations/Version13000Date20170718121200.php +++ b/core/Migrations/Version13000Date20170718121200.php @@ -1,13 +1,32 @@ <?php +/** + * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> + * + * @author Joas Schilling <coding@schilljs.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + namespace OC\Core\Migrations; use Doctrine\DBAL\Schema\Schema; use OCP\Migration\SimpleMigrationStep; use OCP\Migration\IOutput; -/** - * Auto-generated migration step: Please modify to your needs! - */ class Version13000Date20170718121200 extends SimpleMigrationStep { /** diff --git a/core/Migrations/Version13000Date20170814074715.php b/core/Migrations/Version13000Date20170814074715.php new file mode 100644 index 00000000000..097db51984e --- /dev/null +++ b/core/Migrations/Version13000Date20170814074715.php @@ -0,0 +1,78 @@ +<?php +/** + * @copyright Copyright (c) 2017 Joas Schilling <coding@schilljs.com> + * + * @author Joas Schilling <coding@schilljs.com> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +namespace OC\Core\Migrations; + +use Doctrine\DBAL\Schema\Schema; +use OCP\Migration\SimpleMigrationStep; +use OCP\Migration\IOutput; + +class Version13000Date20170814074715 extends SimpleMigrationStep { + + /** + * @param IOutput $output + * @param \Closure $schemaClosure The `\Closure` returns a `Schema` + * @param array $options + * @since 13.0.0 + */ + public function preSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { + } + + /** + * @param IOutput $output + * @param \Closure $schemaClosure The `\Closure` returns a `Schema` + * @param array $options + * @return null|Schema + * @since 13.0.0 + */ + public function changeSchema(IOutput $output, \Closure $schemaClosure, array $options) { + /** @var Schema $schema */ + $schema = $schemaClosure(); + + + if (!$schema->hasTable('accounts')) { + $table = $schema->createTable('accounts'); + $table->addColumn('uid', 'string', [ + 'notnull' => true, + 'length' => 64, + 'default' => '', + ]); + $table->addColumn('data', 'text', [ + 'notnull' => true, + 'default' => '', + ]); + $table->setPrimaryKey(['uid']); + } + + return $schema; + } + + /** + * @param IOutput $output + * @param \Closure $schemaClosure The `\Closure` returns a `Schema` + * @param array $options + * @since 13.0.0 + */ + public function postSchemaChange(IOutput $output, \Closure $schemaClosure, array $options) { + } +} diff --git a/core/css/header.scss b/core/css/header.scss index e744d3acb40..f62759a89d3 100644 --- a/core/css/header.scss +++ b/core/css/header.scss @@ -528,6 +528,11 @@ nav { left: 50%; bottom: 0; z-index: 100; + display: none; + } + li a.active:before, + li:hover a:before, + li:hover a.active:before { display: block; } &.menu-open li:hover a:before, diff --git a/core/templates/loginflow/authpicker.php b/core/templates/loginflow/authpicker.php index c427d657e4a..810c32b4f09 100644 --- a/core/templates/loginflow/authpicker.php +++ b/core/templates/loginflow/authpicker.php @@ -28,8 +28,12 @@ $urlGenerator = $_['urlGenerator']; ?> <div class="picker-window"> + <h2><?php p($l->t('Account access')) ?></h2> <p class="info"> - <?php p($l->t('You are about to grant "%s" access to your %s account.', [$_['client'], $_['instanceName']])) ?> + <?php print_unescaped($l->t('You are about to grant %s access to your %s account.', [ + '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>', + \OCP\Util::sanitizeHTML($_['instanceName']) + ])) ?> </p> <br/> diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index e4e4ffd159d..9d2cb485faf 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -492,6 +492,7 @@ return array( 'OC\\Core\\Middleware\\TwoFactorMiddleware' => $baseDir . '/core/Middleware/TwoFactorMiddleware.php', 'OC\\Core\\Migrations\\Version13000Date20170705121758' => $baseDir . '/core/Migrations/Version13000Date20170705121758.php', 'OC\\Core\\Migrations\\Version13000Date20170718121200' => $baseDir . '/core/Migrations/Version13000Date20170718121200.php', + 'OC\\Core\\Migrations\\Version13000Date20170814074715' => $baseDir . '/core/Migrations/Version13000Date20170814074715.php', 'OC\\DB\\Adapter' => $baseDir . '/lib/private/DB/Adapter.php', 'OC\\DB\\AdapterMySQL' => $baseDir . '/lib/private/DB/AdapterMySQL.php', 'OC\\DB\\AdapterOCI8' => $baseDir . '/lib/private/DB/AdapterOCI8.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index a349650866a..4617b344539 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -522,6 +522,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Core\\Middleware\\TwoFactorMiddleware' => __DIR__ . '/../../..' . '/core/Middleware/TwoFactorMiddleware.php', 'OC\\Core\\Migrations\\Version13000Date20170705121758' => __DIR__ . '/../../..' . '/core/Migrations/Version13000Date20170705121758.php', 'OC\\Core\\Migrations\\Version13000Date20170718121200' => __DIR__ . '/../../..' . '/core/Migrations/Version13000Date20170718121200.php', + 'OC\\Core\\Migrations\\Version13000Date20170814074715' => __DIR__ . '/../../..' . '/core/Migrations/Version13000Date20170814074715.php', 'OC\\DB\\Adapter' => __DIR__ . '/../../..' . '/lib/private/DB/Adapter.php', 'OC\\DB\\AdapterMySQL' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterMySQL.php', 'OC\\DB\\AdapterOCI8' => __DIR__ . '/../../..' . '/lib/private/DB/AdapterOCI8.php', diff --git a/settings/css/settings.css b/settings/css/settings.css index 9202a28899b..e3c48786be3 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -230,6 +230,10 @@ input#passwordbutton { line-height: 1.6em; } +.federationScopeMenu.popovermenu .menuitem .menuitem-text { + font-weight: 600; +} + .federationScopeMenu.popovermenu .menuitem .menuitem-text-detail { opacity: .75; } |