Commit Graph

847 Commits

Author SHA1 Message Date
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
Jasder 529a64194e FIX update .gitigore and rm .idea directory 2020-03-25 12:36:28 +08:00
Jasder 415430a872 FIX update .gitigore and rm .idea directory 2020-03-25 12:36:15 +08:00
sylor_huang@126.com ff7d20a684 修改权限 2020-03-25 10:43:45 +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 2a3708289a 修改pull-request 2020-03-24 17:57:01 +08:00
caicai8 0a5991a93a Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-24 16:51:38 +08:00
caicai8 e7d8a4f0cc issue 2020-03-24 16:51:34 +08:00
sylor_huang@126.com 843c1d14be 修改quill及其他问题 2020-03-24 16:00:57 +08:00
caicai8 34312abc24 admin 2020-03-24 15:42:56 +08:00
caicai8 20e32871d7 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-24 15:40:27 +08:00
caicai8 17d0e3c1a2 get user 2020-03-24 15:40:22 +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 4aa819a109 修改新建项目 2020-03-24 13:26:25 +08:00
sylor_huang@126.com 78212429e5 修改前端bug 2020-03-24 12:01:12 +08:00
sylor_huang@126.com b09afec016 修改删除和增加新建项目 2020-03-24 11:14:12 +08:00
sylor_huang@126.com c3f08312db deletefile增加参数 2020-03-24 10:30:25 +08:00
caicai8 f87c60d2ef Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-23 20:34:01 +08:00
caicai8 e35c8e4cdf issue 2020-03-23 20:33:47 +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 1b89e542ff Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-20 23:48:20 +08:00
dinglink 559f5da65e 限制项目名字长度 2020-03-20 23:48:13 +08:00
caicai8 21e27bdef1 弹框提示 2020-03-20 22:43:25 +08:00
caicai8 acd97d0ba0 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-20 22:27:14 +08:00
caicai8 5d2758b7b7 name 2020-03-20 22:27:09 +08:00
dinglink de0c381197 描述为空的bug 2020-03-20 22:08:29 +08:00
dinglink 22c00f5ce3 描述为空是undfind的问题 2020-03-20 22:07:34 +08:00
caicai8 b88e41f609 401 2020-03-20 21:49:43 +08:00
caicai8 a16d9871a3 路由 2020-03-20 21:40:43 +08:00
caicai8 1621380ba8 issue 2020-03-20 21:20:35 +08:00
caicai8 8bb298f062 issue 2020-03-20 20:50:30 +08:00
caicai8 1457bc1adc issue 2020-03-20 18:54:02 +08:00
caicai8 44366b8a26 路由、分支 2020-03-20 16:49:41 +08:00
caicai8 7dbcdd7b77 issue 2020-03-19 16:10:42 +08:00
caicai8 78ba918514 attachment 2020-03-18 18:40:58 +08:00
caicai8 bb72b3b826 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-18 16:12:08 +08:00
Jasder 53d50a22f8 FIX test push 2020-03-18 16:11:04 +08:00
caicai8 a83b6a1013 工单列表 2020-03-18 16:07:13 +08:00
Jasder 84bffef253 FIX 更改build profuction的配置文件 2020-03-17 21:58:04 +08:00
caicai8 637ce0fc9a 工单部分相关的都改成quill编辑器 2020-03-17 17:23:47 +08:00
Jasder 4875f2c944 first commit 2020-03-16 14:12:11 +08:00
Administrator 5c6b360d40 LICENSE 2020-03-16 10:48:08 +08:00
Administrator b4c88dedc6 .gitignore 2020-03-16 10:48:02 +08:00