 jasder
|
47ecda06ca
|
Merge pull request '个人信息资料提示+新的需求' (#41) from caishi/forgeplus-react:feature_router into feature_router
|
2021-09-03 13:50:38 +08:00 |
 何童崇
|
ebd94ed3a1
|
修改路由相关issue及顺带测出的问题
|
2021-09-03 13:48:56 +08:00 |
caishi
|
d1128a0dfc
|
个人资料完善box style
|
2021-09-03 13:48:07 +08:00 |
 baladiwei
|
47f5d98d79
|
Merge pull request '修改例子中的路由以及新提出的路由，修改之前由于修改路由带来的issue' (#40) from tongChong/forgeplus-react:feature_router into feature_router
|
2021-09-03 11:48:21 +08:00 |
|
何童崇
|
a5bdf26f96
|
修改路由issue
|
2021-09-03 11:38:22 +08:00 |
|
何童崇
|
f6a0c3b33f
|
Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router
|
2021-09-03 11:37:08 +08:00 |
|
jasder
|
9d2dc3426c
|
Merge pull request '关注页面issue+个人资料弹框漏掉的按钮' (#39) from caishi/forgeplus-react:feature_router into feature_router
|
2021-09-03 11:32:40 +08:00 |
|
caishi
|
5abe75d637
|
个人资料issue+样式
|
2021-09-03 11:26:23 +08:00 |
|
何童崇
|
9e14821125
|
Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router
|
2021-09-03 10:17:32 +08:00 |
|
jasder
|
2f3f33d58e
|
Merge pull request '个人资料完善弹框样式修改' (#38) from caishi/forgeplus-react:feature_router into feature_router
|
2021-09-03 10:13:35 +08:00 |
|
caishi
|
43b31427d8
|
弹框样式修改
|
2021-09-03 10:08:24 +08:00 |
|
何童崇
|
03d568f5f7
|
合并蔡世代码并解决冲突
|
2021-09-03 09:26:34 +08:00 |
|
何童崇
|
24c4c746cd
|
修改其他路由及修改issue
|
2021-09-03 09:23:12 +08:00 |
|
jasder
|
3fc0737e43
|
Merge pull request '个人信息资料完善提示弹框，基本资料页面路由修改' (#37) from caishi/forgeplus-react:feature_router into feature_router
|
2021-09-02 17:44:43 +08:00 |
|
何童崇
|
4f39f03b19
|
修改路由的issue
|
2021-09-02 17:20:26 +08:00 |
|
caishi
|
b475edae74
|
hover-issue delete
|
2021-09-02 16:39:35 +08:00 |
|
caishi
|
dbb5efdcd5
|
issue-part 2
|
2021-09-02 15:04:26 +08:00 |
|
caishi
|
322260c3fc
|
Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router
# Conflicts:
# src/forge/Team/List.jsx
|
2021-09-02 14:16:30 +08:00 |
|
caishi
|
375ad38364
|
issue
|
2021-09-02 14:13:16 +08:00 |
|
baladiwei
|
ef6f334d94
|
Merge pull request '修改路由带来的bug' (#36) from tongChong/forgeplus-react:feature_router into feature_router
|
2021-09-02 13:40:15 +08:00 |
|
何童崇
|
559b797c2e
|
修改路由带来的bug
|
2021-09-02 13:37:24 +08:00 |
|
caishi
|
adc134ec44
|
复制-组件
|
2021-09-02 10:10:21 +08:00 |
|
caishi
|
bf3f404238
|
Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router
|
2021-09-01 18:15:32 +08:00 |
|
jasder
|
9b62b3b047
|
Merge pull request '上传路由修改，上传sourcesource-map配置' (#35) from tongChong/forgeplus-react:feature_router into feature_router
|
2021-09-01 17:54:05 +08:00 |
|
caishi
|
c14f06301f
|
appconfig
|
2021-09-01 17:49:42 +08:00 |
|
caishi
|
105e1c61b8
|
个人资料是否完善-弹框
|
2021-09-01 17:46:58 +08:00 |
|
何童崇
|
80dde2bc97
|
上传路由修改，上传sourcesource-map配置
|
2021-09-01 17:34:47 +08:00 |
|
caishi
|
3b03ead3af
|
Merge branch 'feature_router' of https://git.trustie.net/Gitlink/forgeplus-react into feature_router
|
2021-09-01 11:24:43 +08:00 |
|
caishi
|
86f50d4278
|
基本资料
|
2021-09-01 11:24:37 +08:00 |
|
baladiwei
|
bddc0f2f91
|
Merge pull request '改nopage的问题' (#34) from tongChong/forgeplus-react:feature_router into feature_router
|
2021-09-01 11:01:22 +08:00 |
|
何童崇
|
30a141c92e
|
修改nopage的问题
|
2021-09-01 10:58:38 +08:00 |
|
caishi
|
58115f8dae
|
box
|
2021-09-01 10:28:11 +08:00 |
|
baladiwei
|
9655cd5105
|
Merge pull request 'router修改' (#33) from tongChong/forgeplus-react:feature_router into feature_router
|
2021-09-01 09:41:00 +08:00 |
|
何童崇
|
01b3ee8d49
|
修改projects路由
|
2021-09-01 09:33:22 +08:00 |
|
何童崇
|
662a758980
|
修改user/org路由时的bug
|
2021-08-30 17:42:13 +08:00 |
|
何童崇
|
0b64631222
|
合并镜像、权限、wiki修改
|
2021-08-30 10:39:09 +08:00 |
|
何童崇
|
eb02b814a9
|
修改user路由
|
2021-08-30 10:31:51 +08:00 |
|
baladiwei
|
ca9a606e53
|
Merge pull request 'pre-release merge' (#29) from pre_develop_dev into pre_develop
|
2021-08-30 10:26:54 +08:00 |
|
baladiwei
|
8adf7f8de6
|
Merge pull request '优化日期显示' (#31) from tongChong/forgeplus-react:pre_develop_dev into pre_develop_dev
|
2021-08-27 16:33:43 +08:00 |
|
何童崇
|
349c2a6f35
|
修改返回日期的显示
|
2021-08-27 16:31:15 +08:00 |
|
baladiwei
|
f096d6db6e
|
Merge pull request '注释资源库，wiki修改显示' (#30) from tongChong/forgeplus-react:pre_develop_dev into pre_develop_dev
|
2021-08-27 16:10:00 +08:00 |
|
何童崇
|
492e8e067f
|
注释资源库，wiki修改显示
|
2021-08-27 16:07:21 +08:00 |
|
baladiwei
|
95ae2bbd46
|
Merge pull request '组织团队权限-测试通过版' (#28) from caishi/forgeplus-react:pre_develop into pre_develop_dev
|
2021-08-27 15:01:47 +08:00 |
|
caishi
|
a1b5395b8c
|
合并请求-判断条件改成user_admin_or_member
|
2021-08-27 14:04:27 +08:00 |
|
caishi
|
dee7b23f3e
|
转移到组织-提示文案
|
2021-08-27 11:44:41 +08:00 |
|
caishi
|
f7dd67d41a
|
merge
|
2021-08-27 10:54:55 +08:00 |
|
caishi
|
e7fd980116
|
组织团队权限
|
2021-08-27 10:53:00 +08:00 |
|
caishi
|
d8ab7c0759
|
权限问题测试版-第二版
|
2021-08-26 17:38:56 +08:00 |
|
caishi
|
d64eb738f7
|
团队权限分支
|
2021-08-26 17:38:56 +08:00 |
|
jasder
|
55080f93c1
|
Merge pull request '镜像问题websocket失败兼容' (#27) from tongChong/forgeplus-react:hotfix_websocket into pre_develop_dev
|
2021-08-26 17:35:00 +08:00 |