Merge branch 'master' into bugfix/noid/reorder-flicker

This commit is contained in:
Jakob
2020-02-04 12:07:10 +01:00
committed by GitHub
56 changed files with 719 additions and 1143 deletions

View File

@@ -62,8 +62,7 @@ import SharingTabSidebar from './SharingTabSidebar'
import TagsTabSidebar from './TagsTabSidebar'
import DeletedTabSidebar from './DeletedTabSidebar'
import TimelineTabSidebar from './TimelineTabSidebar'
import { AppSidebar } from '@nextcloud/vue/dist/Components/AppSidebar'
import { AppSidebarTab } from '@nextcloud/vue/dist/Components/AppSidebarTab'
import { AppSidebar, AppSidebarTab } from '@nextcloud/vue'
export default {
name: 'BoardSidebar',

View File

@@ -58,11 +58,7 @@
</template>
<script>
import { Avatar } from '@nextcloud/vue/dist/Components/Avatar'
import { Multiselect } from '@nextcloud/vue/dist/Components/Multiselect'
import { Actions } from '@nextcloud/vue/dist/Components/Actions'
import { ActionButton } from '@nextcloud/vue/dist/Components/ActionButton'
import { ActionCheckbox } from '@nextcloud/vue/dist/Components/ActionCheckbox'
import { Avatar, Multiselect, Actions, ActionButton, ActionCheckbox } from '@nextcloud/vue'
import { CollectionList } from 'nextcloud-vue-collections'
import { mapGetters } from 'vuex'
import { getCurrentUser } from '@nextcloud/auth'

View File

@@ -82,8 +82,7 @@
import { mapGetters } from 'vuex'
import { Container, Draggable } from 'vue-smooth-dnd'
import { Actions } from '@nextcloud/vue/dist/Components/Actions'
import { ActionButton } from '@nextcloud/vue/dist/Components/ActionButton'
import { Actions, ActionButton } from '@nextcloud/vue'
import CardItem from '../cards/CardItem'
export default {

View File

@@ -66,7 +66,7 @@
import { mapGetters } from 'vuex'
import Color from '../../mixins/color'
import { ColorPicker } from '@nextcloud/vue/dist/Components/ColorPicker'
import { ColorPicker } from '@nextcloud/vue'
export default {
name: 'TagsTabSidebar',