merge fixes

This commit is contained in:
Čarodej
2022-01-24 08:35:58 +01:00
parent 4396965d4d
commit 3677e51c8f
9 changed files with 401 additions and 1078 deletions

View File

@@ -35,7 +35,7 @@
<ToolbarButton @click.stop.native="showCreateMenu" source="cloud-plus" :action="$t('actions.create')" />
<PopoverItem name="desktop-create" side="left">
<OptionGroup :class="{'is-inactive': canUploadInView || !hasCapacity }">
<OptionGroup :class="{'is-inactive': canUploadInView }">
<OptionUpload :title="$t('actions.upload')" type="file" />
<OptionUpload :title="$t('actions.upload_folder')" type="folder" />
</OptionGroup>