dootask

mirror of https://github.com/kuaifan/dootask.git synced 2025-12-29 07:00:21 +00:00

History

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

# Conflicts:
#	electron/package.json
#	package.json
#	public/css/app.css
#	public/js/app.js
#	public/js/build/120.js
#	public/js/build/120.js.LICENSE.txt
#	public/js/build/146.js.LICENSE.txt
#	public/js/build/161.js
#	public/js/build/284.js
#	public/js/build/309.js
#	public/js/build/400.js
#	public/js/build/644.js
#	public/js/build/644.js.LICENSE.txt
#	public/js/build/79.js.LICENSE.txt
#	resources/assets/js/pages/manage/components/TaskAdd.vue

2022-01-26 09:35:16 +08:00

components

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

2022-01-26 09:35:16 +08:00

_.scss

新增客户端提示升级

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

common.scss

优化前端代码

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

page-calendar.scss

优化完成任务标记