kuaifan 8f0b5dc049 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:12:53 +08:00

..

AbstractController.php

完成登录

2021-05-31 19:52:18 +08:00

apidoc.json

doc

2021-08-29 11:26:04 +08:00

apidoc.php

优化注释

2022-01-06 19:22:29 +08:00

DialogController.php

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

2022-01-25 16:12:53 +08:00

FileController.php

perf: 上传文件夹应该保持目录结构

2022-01-25 14:46:52 +08:00

ProjectController.php

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

2022-01-25 16:12:53 +08:00

ReportController.php

fix:【工作汇报】修复新增今天的周报，提示要覆盖昨天日报的问题

2022-01-22 12:06:21 +08:00

SystemController.php

feat: 自动归档已完成任务

2022-01-06 01:19:44 +08:00

UsersController.php

优化注释

2022-01-06 19:22:29 +08:00