Commit Graph

57 Commits

Author SHA1 Message Date
caishi 59edb107ee 请求 2020-04-29 11:55:40 +08:00
caishi a38ba5c7e2 update 2020-04-29 10:42:53 +08:00
caishi 4bfd4234b5 优化版 2020-04-28 17:23:34 +08:00
sylor_huang@126.com 14ff9e24b4 修改从里程碑新建工单 2020-04-27 18:49:50 +08:00
sylor_huang@126.com 5ab66792c6 修改前端的部分样式 2020-04-27 17:05:27 +08:00
sylor_huang@126.com 4ca3237ab8 修改冲突 2020-04-26 16:55:10 +08:00
sylor_huang@126.com 673165c049 修改部分前端 2020-04-26 16:23:32 +08:00
caicai8 3530352c8f Merge branch 'develop' of http://gitea.trustie.net/jasder/forgeplus-react into develop 2020-04-26 16:07:56 +08:00
caicai8 1b55988fc5 quill点击放大图片 2020-04-26 16:07:51 +08:00
sylor_huang@126.com c0a7e18df9 修改工单的新建/编辑的样式 2020-04-26 09:18:51 +08:00
sylor_huang@126.com 3e54838175 修复冲突 2020-04-24 11:33:21 +08:00
sylor_huang@126.com 07ceddecc8 修改前端的问题 2020-04-24 11:30:28 +08:00
caicai8 76c7ec84d9 issue分割线 2020-04-24 10:43:22 +08:00
sylor_huang@126.com 8276f11c87 修改用户的链接 2020-04-23 16:26:42 +08:00
caicai8 4319067c1c dropdown 2020-04-22 14:31:10 +08:00
caicai8 4ea6c345e6 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Order/New.js
2020-04-10 16:34:33 +08:00
caicai8 83f2c28ae0 issue 2020-04-10 16:33:02 +08:00
sylor_huang@126.com ee3aa25ddc 修改问题 2020-04-09 18:13:26 +08:00
caicai8 1549072286 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Main/Detail.js
2020-04-07 15:58:45 +08:00
caicai8 1090f473ea issue 2020-04-07 15:54:55 +08:00
sylor_huang@126.com 4c11feb276 修改部分bug 2020-04-07 14:03:16 +08:00
dinglink 993f662f45 新增权限 2020-04-03 16:45:59 +08:00
caicai8 748ab612d2 修改工单信息 2020-04-02 18:21:43 +08:00
sylor_huang@126.com d65f771b6b 修改bug 2020-04-01 18:23:57 +08:00
dinglink edc4bb4c40 issue修改 2020-03-31 21:40:53 +08:00
dinglink 364827b63f issue问题修改 2020-03-31 21:36:27 +08:00
caicai8 0ec824d0cb Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/New/Index.js
2020-03-30 19:29:09 +08:00
caicai8 bf7afa9087 新建+issue 2020-03-30 19:26:39 +08:00
dinglink c76723ece0 点击提示及样式修改 2020-03-30 18:51:30 +08:00
sylor_huang@126.com 4706ee05bf 修改前端bug 2020-03-30 11:29:26 +08:00
caicai8 636d2ee36b Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Activity/Activity.js
2020-03-27 18:30:17 +08:00
caicai8 97a9734bf7 issue 2020-03-27 18:29:00 +08:00
sylor_huang@126.com 2299e7cefb 修改评论 2020-03-27 17:18:17 +08:00
sylor_huang@126.com ce0a97e0ad 修改bug 2020-03-27 16:48:33 +08:00
sylor_huang@126.com 94a0a84303 前端部分bug修改 2020-03-27 15:01:28 +08:00
sylor_huang@126.com cc49b02ab5 修改前端bug 2020-03-27 10:05:43 +08:00
dinglink f651e7d80c Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-27 10:04:31 +08:00
dinglink ef229a635d 样式修改 2020-03-27 10:04:21 +08:00
caicai8 538c681d34 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop
# Conflicts:
#	src/forge/Merge/MessageCount.js
2020-03-25 15:16:14 +08:00
caicai8 99792045bc 合并请求 2020-03-25 15:14:20 +08:00
dinglink 56ea97b8b2 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-24 18:06:03 +08:00
dinglink de722c7164 逻辑修改 2020-03-24 18:05:54 +08:00
sylor_huang@126.com 843c1d14be 修改quill及其他问题 2020-03-24 16:00:57 +08:00
sylor_huang@126.com 090db8e9b0 修改quill编辑时的内容 2020-03-24 15:08:57 +08:00
sylor_huang@126.com e11fd89286 修改部分前端问题 2020-03-24 14:22:16 +08:00
sylor_huang@126.com 78212429e5 修改前端bug 2020-03-24 12:01:12 +08:00
sylor_huang@126.com 03b058cae1 修改前端bug 2020-03-23 17:19:44 +08:00
sylor_huang@126.com 1f687dd369 前端修改build 2020-03-23 15:59:50 +08:00
dinglink de0c381197 描述为空的bug 2020-03-20 22:08:29 +08:00
dinglink 22c00f5ce3 描述为空是undfind的问题 2020-03-20 22:07:34 +08:00