Commit Graph
782 Commits
Author SHA1 Message Date
韦荣超 7170eded68 build: 32e891d6ba 2022-02-24 14:38:24 +08:00
韦荣超 5a273676fb build: c3f6edf7c5 2022-02-24 14:03:29 +08:00
韦荣超 e0c0cc8613 build: fbeb3dd81e 2022-02-24 11:50:34 +08:00
kuaifan 9d89af37be build 2022-02-24 09:04:03 +08:00
kuaifan 35b1c12bb5 Merge branch 'develop' of ssh://git.gezi.vip:6006/gx/dootask
# Conflicts:
#	electron/package.json
#	package.json
#	public/js/app.js
2022-02-24 08:07:40 +08:00
kuaifan fc89d96635 优化drawio不显示添加模板 2022-02-24 00:45:53 +08:00
kuaifan 27129652f2 no message 2022-02-23 23:31:59 +08:00
kuaifan 04533e17ec Merge branch 'master' of github.com:kuaifan/dootask into develop
# Conflicts:
#	app/Models/ProjectTask.php
#	public/css/app.css
#	public/js/app.js
#	public/js/build/361.js
#	public/js/build/412.js
#	public/js/build/499.js.LICENSE.txt
#	public/js/build/659.js
#	public/js/build/659.js.LICENSE.txt
#	public/js/build/726.js.LICENSE.txt
#	public/js/build/747.js
2022-02-23 23:18:50 +08:00
kuaifan c115e2f985 build 2022-02-23 22:57:33 +08:00
韦荣超 9782c849ad build: e7efaed08a 2022-02-23 16:27:57 +08:00
韦荣超 e5b838a2b3 build: f9cc2ceb11 2022-02-23 15:55:41 +08:00
韦荣超 b1c5aaff43 build: d0a4473e2b 2022-02-23 15:04:21 +08:00
韦荣超 d0a4473e2b fix: 项目、消息置顶样式修改 2022-02-23 15:02:05 +08:00
韦荣超 d65f8a3c82 build: 96587a4e45 2022-02-23 12:09:41 +08:00
kuaifan 953e924aa2 build 2022-02-23 00:26:44 +08:00
韦荣超 49ff61ad65 build: 695fb60aa4 2022-02-22 17:43:08 +08:00
韦荣超 da20fafa39 build: d6a9ecd912 2022-02-22 17:20:47 +08:00
韦荣超 f95d721c9c build: 69d6417985 2022-02-22 16:51:50 +08:00
kuaifan b0b39429ed build 2022-02-22 12:46:38 +08:00
kuaifan 119f61ef67 build 2022-02-21 18:49:38 +08:00
kuaifan 3112425e43 build 2022-02-20 21:27:52 +08:00
kuaifan 1ab3aefaa5 perf: 更新流程图表 2022-02-20 17:15:01 +08:00
kuaifan be08732e6b 修复暗黑模式流程图无法正常浏览的问题 2022-02-19 14:43:11 +08:00
kuaifan 97b58b5f9a build 2022-02-19 14:31:10 +08:00
kuaifan f4f351cf9d Merge branch 'develop' of ssh://git.gezi.vip:6006/gx/dootask
# Conflicts:
#	public/css/app.css
#	public/js/app.js
#	public/js/build/208.js
#	public/js/build/389.js
#	public/js/build/406.js
#	public/js/build/406.js.LICENSE.txt
#	public/js/build/423.js
#	public/js/build/459.js
#	public/js/build/459.js.LICENSE.txt
#	public/js/build/688.js
#	public/js/build/688.js.LICENSE.txt
#	public/js/build/726.js
#	public/js/build/755.js
#	public/js/build/93.js
#	public/js/build/954.js
2022-02-19 09:30:13 +08:00
韦荣超 09b1d89718 build: ccb889233c 2022-02-18 19:20:42 +08:00
韦荣超 9d1a9f3134 build: ccb889233c 2022-02-18 19:20:35 +08:00
韦荣超 939f2cbf97 build: 4bd8835f23 2022-02-18 18:50:38 +08:00
韦荣超 580e0cb36a build: 4bd8835f23 2022-02-18 18:50:29 +08:00
韦荣超 22f32da0c5 build: aa8a094383 2022-02-18 18:42:49 +08:00
韦荣超 4a72b7f089 build: a33e4905cf 2022-02-18 17:03:18 +08:00
韦荣超 40bd2f0742 build: 1fd73fe79e 2022-02-18 16:45:55 +08:00
韦荣超 fd7d3e06f4 build: 7a4d27da69 2022-02-18 16:17:41 +08:00
韦荣超 afbadf7d81 build: 4f2c0e94d9 2022-02-18 14:02:22 +08:00
韦荣超 7b65c64431 build: 4f2c0e94d9 2022-02-18 14:02:00 +08:00
韦荣超 7593d7a3e9 build: 3400d1e803 2022-02-18 11:54:29 +08:00
韦荣超 f672428fde build: 1521d1e883 2022-02-18 11:29:33 +08:00
韦荣超 4171d993d0 Merge remote-tracking branch 'origin/chao-flow' into develop
# Conflicts:
#	public/js/app.js
2022-02-18 11:25:49 +08:00
韦荣超 d22310ea31 build: 1521d1e883 2022-02-18 11:23:38 +08:00
韦荣超 1521d1e883 fix: 【文件】流程图只读接入新组件及删除旧组件引入代码 2022-02-18 11:21:56 +08:00
韦荣超 0412615f6e build: 2bd666efe7 2022-02-18 10:11:48 +08:00
kuaifan 541e1f760b build 2022-02-17 20:39:47 +08:00
韦荣超 503a719609 build: 2dcbba63cb 2022-02-17 15:22:31 +08:00
韦荣超 5e86bdfda7 build: 4f74a0440c 2022-02-17 14:43:21 +08:00
韦荣超 4f74a0440c perf: 【注册】校验参数是否合法顺序优化 2022-02-17 14:41:49 +08:00
韦荣超 858709f610 build: 6689d48fad 2022-02-17 10:44:23 +08:00
韦荣超 8581a7c308 build: 9878efb198 2022-02-17 09:37:08 +08:00
韦荣超 9855c50367 build: 04c59041e0 2022-02-17 09:19:35 +08:00
韦荣超 04c59041e0 feat: 【消息】列表增加点击右键置顶该聊天功能 2022-02-17 09:17:19 +08:00
kuaifan 7fb1ecc9b0 build 2022-02-15 15:44:43 +08:00