Scarfski/dootask
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,157 Commits 9 Branches 284 Tags
c060e60e4a2a386e94de3e791f779343dfbd5f7c
Commit Graph
782 Commits
Author SHA1 Message Date
kuaifan 86d2bb9e2a 升级tinymce 2022-02-15 15:11:00 +08:00
韦荣超 ab4fbf0437 Merge remote-tracking branch 'origin/chao-flow' into develop 2022-02-15 15:09:49 +08:00
韦荣超 ae527a78ef perf: 【文件】流程图新组件添加切换皮肤主题功能 2022-02-15 15:02:32 +08:00
韦荣超 8218868681 Merge remote-tracking branch 'origin/chao-flow' into develop 2022-02-15 14:15:00 +08:00
韦荣超 251f4ca4ac fix: 【文件】流程图新组件添加缺失图片 2022-02-15 14:13:42 +08:00
韦荣超 5d5c8ced24 Merge remote-tracking branch 'origin/chao-flow' into develop 2022-02-15 11:12:20 +08:00
韦荣超 f0ec9b7826 fix: 【文件】流程图新组件复选框在360浏览器中显示异常修改 2022-02-15 11:05:48 +08:00
韦荣超 cb11a71ff5 build: 重新编译 2022-02-15 09:11:14 +08:00
韦荣超 54dd90fc4a Merge remote-tracking branch 'origin/develop' into develop 
# Conflicts:
#	public/js/app.js
#	public/js/build/423.js
#	public/js/build/726.js
#	public/js/build/93.js
 2022-02-15 09:05:20 +08:00
韦荣超 5115a048a3 Merge remote-tracking branch 'origin/chao-flow' into develop 
# Conflicts:
#	public/css/app.css
#	public/js/app.js
#	public/js/build/423.js
#	public/js/build/93.js
 2022-02-14 18:17:09 +08:00
韦荣超 259351cdd2 fix: 【文件】流程图去掉ctr+s提示框 2022-02-14 18:13:16 +08:00
韦荣超 84116e531b build: 2c1b944b7c 2022-02-14 13:42:45 +08:00
韦荣超 2c1b944b7c fix: 【文件】新版流程图右侧及底部被隐藏问题修改 2022-02-14 13:40:37 +08:00
kuaifan 0e66ca148d build 2022-02-13 14:10:06 +08:00
kuaifan ce70c1ca3a perf: 单条消息最长2000个字符，超过自动分割发送，总最长20000 2022-02-12 17:01:12 +08:00
韦荣超 56b91a59a2 Merge remote-tracking branch 'origin/develop' into develop 2022-02-12 16:02:04 +08:00
kuaifan 8f1fbcb19e no message 2022-02-12 15:10:30 +08:00
韦荣超 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 ea58ed46f2 doc 2022-01-29 16:10:31 +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 469f30044a build: 0993d87799 2022-01-27 17:12:58 +08:00
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
kuaifan 33f3c9acbf build 2022-01-27 12:25:10 +08:00
kuaifan 9e560c79ae 优化聊天消息附件支持预览 2022-01-27 12:17:30 +08:00
kuaifan 705d7f3da0 perf: 聊天消息附件支持预览 2022-01-27 00:44:49 +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
kuaifan 417017add9 优化编辑器皮肤 2022-01-25 23:04:51 +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
kuaifan 003de399dc 支持在线编辑代码 2022-01-25 00:24:47 +08:00
Mr.Huan fa987b4e30 build: b47c494240 2022-01-24 15:50:32 +08:00