Commit Graph

922 Commits

Author SHA1 Message Date
sylor_huang@126.com b23e8c7e53 修改合并请求的显示权限 2020-03-27 18:03:38 +08:00
Jasder 00d866e6e2 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-27 17:30:23 +08:00
Jasder b29c80fb64 FIX 优化点赞、关注等功能 2020-03-27 17:30:16 +08:00
sylor_huang@126.com 2299e7cefb 修改评论 2020-03-27 17:18:17 +08:00
sylor_huang@126.com 424fe4980e 修改版本发布的样式错误 2020-03-27 17:06:23 +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
sylor_huang@126.com 8cd33ee65d 修改删除报错 2020-03-26 18:42:04 +08:00
caicai8 2da3c827b2 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-26 18:13:04 +08:00
caicai8 f9ce3de759 issue 2020-03-26 18:12:53 +08:00
sylor_huang@126.com f619b949f4 修改setting的参数 2020-03-26 16:28:06 +08:00
sylor_huang@126.com e3bb09b530 修改ignore 2020-03-26 14:44:06 +08:00
sylor_huang@126.com 3b88cb3b67 修改ignore 2020-03-26 14:40:12 +08:00
sylor_huang@126.com 79bc855adc 修改SEttingDE bug 2020-03-26 14:39:29 +08:00
sylor_huang@126.com 055c4ae851 修改conflict 2020-03-26 14:24:48 +08:00
sylor_huang@126.com 22fbdcf57a 修改设置的删除功能 2020-03-26 14:13:52 +08:00
Jasder 55008a1dec FIX 修改项目权限名称 2020-03-25 22:33:24 +08:00
Jasder dcb01851b5 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-25 17:52:44 +08:00
caicai8 7a8b028aeb 新建文件接口 2020-03-25 17:52:13 +08:00
caicai8 9e4254e01f 协作者 2020-03-25 17:08:27 +08:00
Jasder 5b5ac99be9 Merge branch 'develop' of http://git.trustie.net/jasder/forgeplus-react into develop 2020-03-25 15:38:17 +08:00
Jasder ed4bd23946 FIX 去掉登录时debug模式 2020-03-25 15:38:10 +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
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