Commit Graph
120 Commits
Author SHA1 Message Date
Mr.Huan 09fa33236f build: 4e9abd6512 2022-01-27 16:33:25 +08:00
Mr.Huan 2996c0b38e build: 36e366abe0 2022-01-27 15:58:26 +08:00
Mr.Huan f9c6c6c127 build: 34772ef2bf 2022-01-27 14:35:17 +08:00
Mr.Huan d0438390cc build: d22266a947 2022-01-26 17:27:42 +08:00
Mr.Huan 675955b2e6 build: 4516bce0ee 2022-01-26 17:14:58 +08:00
Mr.Huan 4853fbcec3 build: 72e5f9a83e 2022-01-26 15:04:03 +08:00
Mr.Huan 1a1ddc34a2 build: 40ebfb676c 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
Mr.Huan b5e3cc2503 build: 2e11fe2b58 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: ff62ef729a 2022-01-25 09:39:03 +08:00
kuaifan d0a432164d build 2022-01-25 02:06:27 +08:00
Mr.Huan fa987b4e30 build: b47c494240 2022-01-24 15:50:32 +08:00
Mr.Huan a31134195b build: 5580a4ee3d 2022-01-24 15:08:38 +08:00
Mr.Huan 608660a101 build: 25cb8015d0 2022-01-24 11:56:07 +08:00
Mr.Huan e686e8f58c build: 14b699b5b1 2022-01-24 10:39:13 +08:00
韦荣超 ce0c86c8e5 build: 11d1f26724 2022-01-24 10:22:45 +08:00
Mr.Huan a8c0978f0d build: 0a0227cca4 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: 6529e45868 2022-01-22 15:39:25 +08:00
Mr.Huan 7dc6d0ffb2 build: 6529e45868 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: 2eabc76c1a 2022-01-22 13:53:13 +08:00
韦荣超 1f96af1024 build: 563aa92958 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: a1aaf90d2e 2022-01-21 21:01:08 +08:00
韦荣超 53ed4d4072 build: da75554447 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: 2dd8f75d52 2022-01-21 18:10:24 +08:00
kuaifan 7a4bdd0ada no message 2022-01-21 17:59:08 +08:00
韦荣超 0ed0b5ee43 build: 2475ee90ee 2022-01-21 17:41:09 +08:00
kuaifan 511c19d5aa 优化前端代码 2022-01-21 14:49:20 +08:00
kuaifan da3672e6be 优化前端代码 2022-01-21 14:24:31 +08:00
kuaifan 52e9836bbf build 2022-01-21 14:07:14 +08:00
韦荣超 a44d6b8b79 build: 942cf57c36 2022-01-21 12:10:48 +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
kuaifan 1abd78305f Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
#	public/css/app.css
#	public/js/app.js
#	public/js/build/120.js
#	public/js/build/120.js.LICENSE.txt
#	public/js/build/198.js
#	public/js/build/494.js
#	public/js/build/79.js
#	public/js/build/793.js
#	public/js/build/875.js
#	public/js/build/890.js
#	resources/assets/js/components/DrawerOverlay.vue
2022-01-17 17:13:12 +08:00
kuaifan e1ef9a94af no message 2022-01-17 00:36:19 +08:00
kuaifan 9f62023175 build 2022-01-17 00:12:34 +08:00
kuaifan 7a28a8950c 修复前端编译 2022-01-16 00:43:05 +08:00
kuaifan 74803df5bd no message 2022-01-15 23:37:29 +08:00
kuaifan c6ebe994cc build 2022-01-15 12:53:21 +08:00