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

# Conflicts:
#	app/Http/Controllers/Api/DialogController.php
#	app/Http/Controllers/Api/ProjectController.php
#	electron/package.json
#	package.json
#	public/css/app.css
#	public/docs/assets/main.bundle.js
#	public/js/app.js
#	public/js/build/146.js.LICENSE.txt
#	public/js/build/161.js
#	public/js/build/199.js
#	public/js/build/199.js.LICENSE.txt
#	public/js/build/218.js
#	public/js/build/218.js.LICENSE.txt
#	public/js/build/244.js
#	public/js/build/244.js.LICENSE.txt
#	public/js/build/309.js
#	public/js/build/423.js
#	public/js/build/43.js
#	public/js/build/693.js
#	public/js/build/717.js
#	public/js/build/717.js.LICENSE.txt
#	public/js/build/79.js.LICENSE.txt
#	resources/assets/js/pages/manage/components/TaskAdd.vue

2022-01-28 14:39:43 +08:00

..

.gitignore

perf: Windows客户端无法关闭的情况

2021-12-28 16:55:29 +08:00

build.js

优化自定义服务器

2022-01-11 10:31:37 +08:00

index.html

优化自定义服务器

2022-01-11 10:31:37 +08:00

main.js

修复客户端

2022-01-16 01:11:19 +08:00

package.json

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

2022-01-28 14:39:43 +08:00

preload.js

no message

2021-07-07 18:37:00 +08:00

utils.js

perf: 优化客户端自动更新

2022-01-15 23:36:21 +08:00