韦荣超
|
a4799a1bc0
|
“新版本流程图文件”
|
2022-02-12 15:04:11 +08:00 |
|
韦荣超
|
230d1a1f86
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# app/Http/Controllers/Api/FileController.php
# public/js/build/208.js
# public/js/build/252.js
# public/js/build/400.js
# public/js/build/76.js
|
2022-02-11 11:01:05 +08:00 |
|
kuaifan
|
f7921bf388
|
build
|
2022-02-10 21:18:18 +08:00 |
|
kuaifan
|
17e5d15b1b
|
build
|
2022-02-09 21:50:12 +08:00 |
|
kuaifan
|
b28be29dc8
|
build
|
2022-02-09 17:29:36 +08:00 |
|
韦荣超
|
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
|
32817a4275
|
build
|
2022-01-29 16:04:28 +08:00 |
|
kuaifan
|
3d04bd4444
|
build
|
2022-01-28 18:29:15 +08:00 |
|
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 |
|
kuaifan
|
3c7619098a
|
build
|
2022-01-28 01:20:36 +08:00 |
|
Mr.Huan
|
09fa33236f
|
build: 4e9abd65120687e4bb6c84a037596c4c725f96fc
|
2022-01-27 16:33:25 +08:00 |
|
Mr.Huan
|
2996c0b38e
|
build: 36e366abe0f3af6b2693708a5f012b2ef7fcc57a
|
2022-01-27 15:58:26 +08:00 |
|
Mr.Huan
|
f9c6c6c127
|
build: 34772ef2bf11535c588e594ac976cd0706fc3e91
|
2022-01-27 14:35:17 +08:00 |
|
kuaifan
|
33f3c9acbf
|
build
|
2022-01-27 12:25:10 +08:00 |
|
kuaifan
|
9e560c79ae
|
优化聊天消息附件支持预览
|
2022-01-27 12:17:30 +08:00 |
|
Mr.Huan
|
d0438390cc
|
build: d22266a94725640f85bceb9978c13449dfa5c35c
|
2022-01-26 17:27:42 +08:00 |
|
Mr.Huan
|
675955b2e6
|
build: 4516bce0eecf7f6224fde7cbd0c1de74be3f05af
|
2022-01-26 17:14:58 +08:00 |
|
Mr.Huan
|
4853fbcec3
|
build: 72e5f9a83ed00e9514c3d6e9991d7ddf3193659c
|
2022-01-26 15:04:03 +08:00 |
|
Mr.Huan
|
1a1ddc34a2
|
build: 40ebfb676c044b8f02d3d43105de34b2762fab9c
|
2022-01-26 14:46:37 +08:00 |
|
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 |
|
kuaifan
|
482813ea88
|
build
|
2022-01-26 01:33:53 +08:00 |
|
kuaifan
|
417017add9
|
优化编辑器皮肤
|
2022-01-25 23:04:51 +08:00 |
|
Mr.Huan
|
b5e3cc2503
|
build: 2e11fe2b5852ddaa7e14bf32f4e4e246ce539084
|
2022-01-25 16:51:32 +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 |
|
Mr.Huan
|
6115eea401
|
build: ff62ef729a15d819970f155d657bbac2e85e2760
|
2022-01-25 09:39:03 +08:00 |
|
kuaifan
|
d0a432164d
|
build
|
2022-01-25 02:06:27 +08:00 |
|
kuaifan
|
003de399dc
|
支持在线编辑代码
|
2022-01-25 00:24:47 +08:00 |
|
Mr.Huan
|
fa987b4e30
|
build: b47c49424051a2233e0e826dbf9b4ce3447e4b89
|
2022-01-24 15:50:32 +08:00 |
|
Mr.Huan
|
a31134195b
|
build: 5580a4ee3db922ec516178231a00d121b29fdc88
|
2022-01-24 15:08:38 +08:00 |
|
Mr.Huan
|
608660a101
|
build: 25cb8015d0d46f8c0acf48d114df7d722cb90673
|
2022-01-24 11:56:07 +08:00 |
|
Mr.Huan
|
e686e8f58c
|
build: 14b699b5b199f4568ab006b7657f811069f8420d
|
2022-01-24 10:39:13 +08:00 |
|
韦荣超
|
ce0c86c8e5
|
build: 11d1f26724ebd740abf0c2f6f1c9fa4c51ad1802
|
2022-01-24 10:22:45 +08:00 |
|
Mr.Huan
|
a8c0978f0d
|
build: 0a0227cca43d3b211cd38fd23d4426d4a104036a
|
2022-01-24 09:31:52 +08:00 |
|
kuaifan
|
8bacc3b6ba
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# electron/package.json
# package.json
# public/js/app.js
# public/js/build/161.js
# public/js/build/400.js
# public/js/build/616.js
# public/js/build/845.js
|
2022-01-24 01:45:08 +08:00 |
|
kuaifan
|
d516330a41
|
feat: 聊天粘贴发送文件、图片时预览确认
|
2022-01-24 01:30:10 +08:00 |
|
kuaifan
|
2d83faf144
|
build
|
2022-01-24 00:42:58 +08:00 |
|
Mr.Huan
|
d46eec568c
|
build: 6529e4586820ae388273295f956e2f142275a494
|
2022-01-22 15:39:25 +08:00 |
|
Mr.Huan
|
7dc6d0ffb2
|
build: 6529e4586820ae388273295f956e2f142275a494
|
2022-01-22 15:28:37 +08:00 |
|
kuaifan
|
b6ff6f5453
|
Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
# public/js/app.js
# public/js/build/657.js
# public/js/build/782.js
# public/js/build/845.js
|
2022-01-22 14:18:32 +08:00 |
|
Mr.Huan
|
cfa529b742
|
build: 2eabc76c1a7da69f9e5efd9cda024eb51daa19f7
|
2022-01-22 13:53:13 +08:00 |
|
韦荣超
|
1f96af1024
|
build: 563aa9295850392b13d1a1ef7600ebb80e2d3b87
|
2022-01-22 10:37:27 +08:00 |
|
kuaifan
|
f09b864e30
|
perf: 仅客户端或Chrome浏览器支持主题功能
|
2022-01-22 09:07:13 +08:00 |
|
kuaifan
|
7ce15d5a71
|
优化代码
|
2022-01-21 23:31:01 +08:00 |
|
kuaifan
|
cc767b164e
|
优化工作报告
|
2022-01-21 23:16:50 +08:00 |
|
韦荣超
|
d8426780d2
|
build: a1aaf90d2ef6af3e46e22bf73016ae80f97a6aa2
|
2022-01-21 21:01:08 +08:00 |
|
韦荣超
|
53ed4d4072
|
build: da75554447c8deb7167390d56bfbe9927266a1ee
|
2022-01-21 19:59:44 +08:00 |
|
韦荣超
|
04998d6a60
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# public/js/app.js
|
2022-01-21 18:10:53 +08:00 |
|
韦荣超
|
3d88a28465
|
build: 2dd8f75d526514a0adec9d3c8eac5f026b41eed0
|
2022-01-21 18:10:24 +08:00 |
|