Merge branch 'main' into vue3

# Conflicts:
#	src/components/input/editor.vue
#	src/components/list/partials/filters.vue
#	src/components/tasks/partials/editAssignees.vue
#	src/helpers/find.ts
#	src/helpers/time/formatDate.js
#	src/main.ts
#	src/store/modules/attachments.js
#	src/store/modules/kanban.js
#	src/views/list/views/List.vue
#	yarn.lock
This commit is contained in:
Dominik Pschenitschni 2021-10-07 12:20:52 +02:00
commit 3a7a4bdc42
No known key found for this signature in database
GPG key ID: B257AC0149F43A77
120 changed files with 717 additions and 272 deletions

View file

@ -1,6 +1,4 @@
import cloneDeep from 'lodash/cloneDeep'
import {findById, findIndexById} from '@/helpers/find'
import {findById, findIndexById} from '@/helpers/utils'
import BucketService from '../../services/bucket'
import {setLoading} from '../helper'
import TaskCollectionService from '@/services/taskCollection'
@ -253,7 +251,7 @@ export default {
const cancel = setLoading(ctx, 'kanban')
ctx.commit('setBucketLoading', {bucketId: bucketId, loading: true})
const params = cloneDeep(ps)
const params = JSON.parse(JSON.stringify(ps))
params.sort_by = 'kanban_position'
params.order_by = 'asc'