104 Commits

Author SHA1 Message Date
韦荣超
d9b9c0f42c build: aa0597c27ef27c867f7d4028c8c12ea97d6e2f90 2022-03-02 15:46:23 +08:00
韦荣超
6ba4170f08 build: 827bc97e8e18d7ce9ef796e893a371a936660d5f 2022-03-02 15:21:36 +08:00
kuaifan
54d215b8d1 Merge branch 'develop' of ssh://git.gezi.vip:6006/gx/dootask 2022-03-02 08:30:33 +08:00
韦荣超
420245c630 build: 20cf83907ddde666cb2cbdc29c9b7fe994a5216e 2022-03-01 15:54:39 +08:00
韦荣超
d09ab541ab build: a9e1dc3cd5429393e395b6f7c5c94ae8174e7d00 2022-03-01 11:04:20 +08:00
韦荣超
1551e6c640 build: 03a1bdfc7ffbb389c0f1034fb13dfa90d7e0c8d8 2022-03-01 09:39:12 +08:00
kuaifan
ab388f1ef5 Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
#	public/css/app.css
#	public/js/app.js
#	public/js/build/248.js
#	public/js/build/248.js.LICENSE.txt
#	public/js/build/501.js
#	public/js/build/510.js.LICENSE.txt
#	public/js/build/581.js.LICENSE.txt
#	public/js/build/601.js
#	public/js/build/712.js
#	public/js/build/747.js
#	resources/assets/js/pages/manage/file.vue
#	resources/assets/sass/pages/page-manage.scss
2022-02-28 10:26:12 +08:00
kuaifan
101d5c7eb0 build 2022-02-28 00:23:20 +08:00
kuaifan
31d1b0c994 nomsg 2022-02-27 15:03:39 +08:00
kuaifan
356d40e640 feat: 文件支持拖动到列表上传 2022-02-25 22:49:56 +08:00
kuaifan
ea8e1e9c57 优化样式 2022-02-25 15:14:20 +08:00
韦荣超
b0998d5f95 build: a074cb9664cfccac4df536375f91c43ce6fc88b0 2022-02-25 10:56:20 +08:00
kuaifan
14006068c8 优化样式 2022-02-25 00:13:15 +08:00
韦荣超
7170eded68 build: 32e891d6ba6872695515d1abada3c7c00aafd0ce 2022-02-24 14:38:24 +08:00
韦荣超
5a273676fb build: c3f6edf7c54ba4488f8fd220bf4ed02c90a36938 2022-02-24 14:03:29 +08:00
kuaifan
9d89af37be build 2022-02-24 09:04:03 +08:00
kuaifan
27129652f2 no message 2022-02-23 23:31:59 +08:00
kuaifan
c115e2f985 build 2022-02-23 22:57:33 +08:00
kuaifan
1ab3aefaa5 perf: 更新流程图表 2022-02-20 17:15:01 +08:00
kuaifan
97b58b5f9a build 2022-02-19 14:31:10 +08:00
韦荣超
858709f610 build: 6689d48fadfc1f1c5ddfe0ecaa05f1d75b70161e 2022-02-17 10:44:23 +08:00
韦荣超
9855c50367 build: 04c59041e0a135e835530baad95e2402d7b02a37 2022-02-17 09:19:35 +08:00
韦荣超
cb11a71ff5 build: 重新编译 2022-02-15 09:11:14 +08:00
韦荣超
84116e531b build: 2c1b944b7ced9b1401be1d263b38c8c546bb33cf 2022-02-14 13:42:45 +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
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
33f3c9acbf build 2022-01-27 12:25:10 +08:00
kuaifan
705d7f3da0 perf: 聊天消息附件支持预览 2022-01-27 00:44:49 +08:00
kuaifan
482813ea88 build 2022-01-26 01:33:53 +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
d0a432164d build 2022-01-25 02:06:27 +08:00
Mr.Huan
608660a101 build: 25cb8015d0d46f8c0acf48d114df7d722cb90673 2022-01-24 11:56:07 +08:00
韦荣超
ce0c86c8e5 build: 11d1f26724ebd740abf0c2f6f1c9fa4c51ad1802 2022-01-24 10:22:45 +08:00
kuaifan
d516330a41 feat: 聊天粘贴发送文件、图片时预览确认 2022-01-24 01:30:10 +08:00
kuaifan
2d83faf144 build 2022-01-24 00:42:58 +08:00
kuaifan
cc767b164e 优化工作报告 2022-01-21 23:16:50 +08:00
kuaifan
7a4bdd0ada no message 2022-01-21 17:59:08 +08:00
韦荣超
0ed0b5ee43 build: 2475ee90ee493c5e88686a2dd618782f6c6a0850 2022-01-21 17:41:09 +08:00
kuaifan
da3672e6be 优化前端代码 2022-01-21 14:24:31 +08:00
kuaifan
52e9836bbf build 2022-01-21 14:07:14 +08:00
kuaifan
cd9c1d9660 Merge branch 'master' of github.com:kuaifan/dootask into develop 2022-01-21 13:54:58 +08:00
韦荣超
a44d6b8b79 build: 942cf57c36c5fb2b636047edbebd75fc6c25c777 2022-01-21 12:10:48 +08:00
kuaifan
0dc0e7226e 调整主题色 2022-01-20 22:59:51 +08:00
kuaifan
a9e71567fe 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/146.js
#	public/js/build/169.js
#	public/js/build/631.js
#	public/js/build/679.js
#	public/js/build/700.js
#	public/js/build/728.js
#	public/js/build/802.js
#	public/js/build/823.js
#	public/js/build/954.js
#	resources/assets/js/pages/manage.vue
2022-01-20 00:33:05 +08:00
kuaifan
0fae151731 build 2022-01-20 00:20:06 +08:00