dootask

mirror of https://github.com/kuaifan/dootask.git synced 2026-01-15 03:08:11 +00:00

History

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

components

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

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

_.scss

新增客户端提示升级

2021-12-22 15:37:19 +08:00

common.scss

优化前端代码

2022-01-21 21:02:17 +08:00

page-calendar.scss

优化完成任务标记