Skip to content

Commit 3438e1f

Browse files
authored
Merge pull request #48965 from nextcloud/feat/files-bulk-tagging-followup
2 parents daa09f8 + 96583c9 commit 3438e1f

11 files changed

Lines changed: 15 additions & 8 deletions

apps/systemtags/src/components/SystemTagPicker.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -484,6 +484,12 @@ export default defineComponent({
484484
bottom: 0;
485485
padding-block: 8px;
486486
487+
:deep(.notecard) {
488+
// min 2 lines of text to avoid jumping
489+
min-height: 2lh;
490+
align-items: center;
491+
}
492+
487493
& > div {
488494
margin: 0 !important;
489495
}

core/Migrations/Version31000Date20241018063111.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
namespace OC\Core\Migrations;
1111

1212
use Closure;
13+
use Doctrine\DBAL\Types\Types;
1314
use OCP\DB\ISchemaWrapper;
1415
use OCP\Migration\IOutput;
1516
use OCP\Migration\SimpleMigrationStep;
@@ -41,7 +42,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
4142
$table = $schema->getTable('systemtag');
4243

4344
if (!$table->hasColumn('etag')) {
44-
$table->addColumn('etag', 'string', [
45+
$table->addColumn('etag', Types::STRING, [
4546
'notnull' => false,
4647
'length' => 32,
4748
]);

dist/6028-6028.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/6028-6028.js.map

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/6028-6028.js.map.license

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6028-6028.js.license

0 commit comments

Comments
 (0)