…owcase

…owcase

…ails-showcase

…ails-showcase

# Conflicts:
#	core/block/editor/archive.go
#	core/block/editor/dataview/dataview.go
#	core/block/export/export.go
#	core/block/import/common/common.go
#	core/block/import/importer.go
#	core/block/import/pb/converter.go
#	core/block/object/objectcreator/installer.go
#	core/object.go
#	core/subscription/service.go
#	core/util.go
#	pkg/lib/database/database.go
#	pkg/lib/database/filter.go
#	pkg/lib/database/order.go
#	pkg/lib/database/quickoptions.go
#	pkg/lib/localstore/objectstore/relations.go
#	util/builtinobjects/builtinobjects.go

# Conflicts:
#	core/block/bookmark/bookmark_service.go
#	core/block/editor.go
#	core/block/editor/smartblock/links.go
#	core/block/editor/smartblock/smartblock.go
#	core/block/import/common/objectcreator/objectcreator.go
#	core/block/import/common/objectcreator/objectcreator_test.go
#	core/block/import/common/objectid/existingobject.go
#	core/block/import/csv/collectionstrategy.go
#	core/block/object/objectcreator/creator.go
#	core/block/object/objectlink/dependent_objects.go
#	core/block/object/objectlink/dependent_objects_test.go
#	core/converter/dot/dot.go
#	core/converter/graphjson/graphjson.go
#	core/history/history.go
#	pkg/lib/database/filter.go
#	pkg/lib/localstore/objectstore/queries_test.go
#	util/slice/slice.go

# Conflicts:
#	.mockery.yaml
#	core/create.go
#	go.mod
#	pkg/lib/database/filter.go
#	pkg/lib/database/filter_test.go
#	pkg/lib/localstore/objectstore/queries_test.go

# Conflicts:
#	pkg/lib/database/filter.go

… new-details-showcase

# Conflicts:
#	.mockery.yaml
#	core/block/details.go
#	core/block/editor/basic/basic.go
#	core/block/editor/basic/details.go
#	core/block/editor/objecttype/lastused.go
#	core/block/editor/objecttype/lastused_test.go
#	core/block/editor/state/state.go
#	core/block/import/notion/api/commonobjects.go
#	core/block/import/notion/api/database/database.go
#	core/block/import/notion/api/database/database_test.go
#	core/block/import/notion/api/page/page_test.go
#	core/block/import/notion/api/page/task.go
#	core/block/import/notion/api/property/relationsmaps.go
#	core/block/object/objectcreator/chat.go
#	core/block/object/objectcreator/smartblock.go
#	core/block/service.go
#	core/block/source/store.go
#	core/create.go
#	core/files/file.go
#	core/files/fileobject/migration_test.go
#	core/indexer/fulltext_test.go
#	core/object.go
#	core/syncstatus/filestatus.go
#	core/syncstatus/updatereceiver.go
#	core/syncstatus/updatereceiver_test.go
#	pkg/lib/database/filter.go
#	pkg/lib/database/filter_test.go
#	pkg/lib/localstore/objectstore/fixture.go
#	pkg/lib/localstore/objectstore/objects.go
#	space/internal/components/migration/systemobjectreviser/systemobjectreviser.go
#	util/testMock/objectstore_mock.go