Merge pull request #48965 from nextcloud/feat/files-bulk-tagging-foll…

…owup
nextcloud · Oct 29, 2024 · 3438e1f · 3438e1f
2 parents daa09f8 + 96583c9
commit 3438e1f
Show file tree

Hide file tree

Showing 11 changed files with 15 additions and 8 deletions.
diff --git a/apps/systemtags/src/components/SystemTagPicker.vue b/apps/systemtags/src/components/SystemTagPicker.vue
@@ -484,6 +484,12 @@ export default defineComponent({
 	bottom: 0;
 	padding-block: 8px;
 
+	:deep(.notecard) {
+		// min 2 lines of text to avoid jumping
+		min-height: 2lh;
+		align-items: center;
+	}
+
 	& > div {
 		margin: 0 !important;
 	}

diff --git a/core/Migrations/Version31000Date20241018063111.php b/core/Migrations/Version31000Date20241018063111.php
@@ -10,6 +10,7 @@
 namespace OC\Core\Migrations;
 
 use Closure;
+use Doctrine\DBAL\Types\Types;
 use OCP\DB\ISchemaWrapper;
 use OCP\Migration\IOutput;
 use OCP\Migration\SimpleMigrationStep;
@@ -41,7 +42,7 @@ public function changeSchema(IOutput $output, Closure $schemaClosure, array $opt
 			$table = $schema->getTable('systemtag');
 
 			if (!$table->hasColumn('etag')) {
-				$table->addColumn('etag', 'string', [
+				$table->addColumn('etag', Types::STRING, [
 					'notnull' => false,
 					'length' => 32,
 				]);

diff --git a/dist/6028-6028.js b/dist/6028-6028.js
diff --git a/dist/8699-8699.js.license → dist/6028-6028.js.license b/dist/8699-8699.js.license → dist/6028-6028.js.license
diff --git a/dist/6028-6028.js.map b/dist/6028-6028.js.map
diff --git a/dist/6028-6028.js.map.license b/dist/6028-6028.js.map.license
@@ -0,0 +1 @@
+6028-6028.js.license