韦荣超
|
3d6df3cc09
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# app/Http/Controllers/Api/DialogController.php
# app/Http/Controllers/Api/ProjectController.php
# app/Models/Project.php
# electron/package.json
# package.json
# public/css/app.css
# public/js/app.js
# public/js/build/146.js
# public/js/build/188.js
# public/js/build/188.js.LICENSE.txt
# public/js/build/244.js
# public/js/build/244.js.LICENSE.txt
# public/js/build/278.js
# public/js/build/278.js.LICENSE.txt
# public/js/build/30.js
# public/js/build/423.js
# public/js/build/43.js
# public/js/build/525.js
# public/js/build/644.js.LICENSE.txt
# public/js/build/660.js
# public/js/build/766.js
# public/js/build/831.js
# public/js/build/893.js
# public/js/build/919.js
# public/js/build/919.js.LICENSE.txt
# public/js/build/934.js
# public/js/build/934.js.LICENSE.txt
# resources/assets/js/pages/manage/components/DialogList.vue
# resources/assets/js/pages/manage/components/DialogWrapper.vue
# resources/assets/js/pages/manage/components/TaskAdd.vue
# resources/assets/sass/components/report.scss
|
2022-02-07 10:50:38 +08:00 |
|
kuaifan
|
3c7619098a
|
build
|
2022-01-28 01:20:36 +08:00 |
|
kuaifan
|
33f3c9acbf
|
build
|
2022-01-27 12:25:10 +08:00 |
|
Mr.Huan
|
1a1ddc34a2
|
build: 40ebfb676c044b8f02d3d43105de34b2762fab9c
|
2022-01-26 14:46:37 +08:00 |
|
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 |
|
kuaifan
|
7f14a82053
|
perf: 任务群聊中拖拽文件或者照片时并未有确认窗口
|
2022-01-25 16:06:26 +08:00 |
|
kuaifan
|
f468f7ae27
|
build
|
2022-01-25 15:05:46 +08:00 |
|
kuaifan
|
d0a432164d
|
build
|
2022-01-25 02:06:27 +08:00 |
|
Mr.Huan
|
e686e8f58c
|
build: 14b699b5b199f4568ab006b7657f811069f8420d
|
2022-01-24 10:39:13 +08:00 |
|
Mr.Huan
|
a8c0978f0d
|
build: 0a0227cca43d3b211cd38fd23d4426d4a104036a
|
2022-01-24 09:31:52 +08:00 |
|
kuaifan
|
d516330a41
|
feat: 聊天粘贴发送文件、图片时预览确认
|
2022-01-24 01:30:10 +08:00 |
|
kuaifan
|
2d83faf144
|
build
|
2022-01-24 00:42:58 +08:00 |
|