local-it/vikunja-frontend
Archived
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'main' into vue3

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

2
src/views/tasks/TaskDetailView.vue
View file

@ -423,7 +423,6 @@
<script>
import TaskService from '../../services/task'
import TaskModel from '../../models/task'
import relationKinds from '../../models/constants/relationKinds.json'
import priorites from '../../models/constants/priorities.json'
import rights from '../../models/constants/rights.json'
@ -473,7 +472,6 @@ export default {
return {
taskService: new TaskService(),
task: new TaskModel(),
relationKinds: relationKinds,
// We doubled the task color property here because verte does not have a real change property, leading
// to the color property change being triggered when the # is removed from it, leading to an update,
// which leads in turn to a change... This creates an infinite loop in which the task is updated, changed,