Merge branch 'master' of github.com:kuaifan/dootask into develop

# Conflicts: # app/Http/Controllers/Api/DialogController.php # electron/package.json # package.json # public/css/app.css # public/js/app.js # public/js/build/146.js # public/js/build/146.js.LICENSE.txt # public/js/build/178.js # public/js/build/178.js.LICENSE.txt # public/js/build/199.js # public/js/build/199.js.LICENSE.txt # public/js/build/309.js # public/js/build/328.js.LICENSE.txt # public/js/build/388.js # public/js/build/43.js # public/js/build/46.js.LICENSE.txt # public/js/build/857.js # public/js/build/857.js.LICENSE.txt # public/js/build/893.js
2022-01-25 16:11:23 +08:00
parent 778f6367f9 7f14a82053
commit 8f0b5dc049
1042 changed files with 7455 additions and 81206 deletions
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "DooTask",
-    "version": "0.6.90",
+    "version": "0.7.41",
    "description": "DooTask is task management system.",
    "scripts": {
        "start": "./cmd dev",
@@ -64,7 +64,7 @@
        "stylus-loader": "^6.2.0",
        "tinymce": "^5.10.2",
        "tui-calendar-hi": "^1.15.1-5",
-        "view-design-hi": "^4.7.0-7",
+        "view-design-hi": "^4.7.0-8",
        "vue": "^2.6.14",
        "vue-clipboard2": "^0.3.3",
        "vue-emoji-picker": "^1.0.3",