Merge branch 'develop'

编辑合并请求-url地址错误
2021-05-08 16:53:26 +08:00 · 2021-05-08 14:36:12 +08:00 · 2021-05-07 16:37:21 +08:00 · 2021-05-06 17:15:43 +08:00 · 2021-05-06 17:14:42 +08:00 · 2021-05-06 17:14:30 +08:00
2 changed files with 3 additions and 3 deletions
--- a/src/forge/Main/sub/DetailBanner.jsx
+++ b/src/forge/Main/sub/DetailBanner.jsx
@ -75,7 +75,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                    </li>
                    :""
                  }
-                  {
+                  {/* {
                    item.menu_name === "resources" &&
                    <li className={pathname==="source" ? "active" : ""}>
                      <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
@ -84,7 +84,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
                          {projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""}
                      </Link>
                    </li>
-                  }
+                  } */}
                  {
                    item.menu_name === "versions" &&
                    <li className={pathname==="milestones" ? "active" : ""}>
--- a/src/forge/Settings/Setting.js
+++ b/src/forge/Settings/Setting.js
@ -15,7 +15,7 @@ const menu = [
  {name:"易修 (Issue)",index:"issues"},
  {name:"合并请求",index:"pulls"},
  {name:"工作流(beta版)",index:"devops"},
-  {name:"资源库",index:"resources"},
+  // {name:"资源库",index:"resources"},
  {name:"里程碑",index:"versions"},
  {name:"动态",index:"activity"},
 ]
Author	SHA1	Message	Date
caishi	705bfb07bd	Merge branch 'develop'	2021-05-08 16:53:26 +08:00
caishi	d783d998fc	编辑合并请求-url地址错误	2021-05-08 14:36:12 +08:00
caishi	51925542b8	Merge branch 'develop' # Conflicts: # public/css/edu-purge.css	2021-05-07 16:37:21 +08:00
caishi	ff06efe109	merge develop	2021-05-06 17:15:43 +08:00
caishi	c33561c212	新建项目-maxlength	2021-05-06 17:14:42 +08:00
caishi	2deb6f8f9d	设置所有标签的marginbottom为0	2021-05-06 17:14:30 +08:00
caishi	63d69a955e	代码库-提交描述未换行	2021-05-06 17:14:19 +08:00
caishi	4d652d238d	不能修改组织账号	2021-04-27 17:25:00 +08:00
caishi	6da4dbc165	组织团队-无数据显示错误	2021-04-27 09:45:14 +08:00
caishi	f65f4c273a	组织基本设置-正则和新建的页面不一致	2021-04-26 16:32:12 +08:00
caishi	1af504825c	代码库编辑文件-切换到其它目录后要重新将编辑状态改为显示状态	2021-04-25 18:00:05 +08:00
caishi	e94cf68cc5	样式覆盖	2021-04-23 18:04:49 +08:00
caishi	5fa2fd99b9	Merge branch 'develop'	2021-04-23 14:51:04 +08:00
caishi	20ab8a6683	Merge branch 'develop'	2021-04-23 14:47:50 +08:00
caishi	a7f709a663	Merge branch 'develop'	2021-04-23 14:16:30 +08:00
caishi	63c2cfed70	Merge branch 'develop'	2021-04-22 10:58:30 +08:00
caishi	80cd6fbae0	md文件要用Markdown渲染	2021-04-20 15:33:21 +08:00
caishi	49d3db6746	合并请求-提出申请者头像显示问题	2021-04-20 11:18:44 +08:00
caishi	bc11ec68e3	注释	2021-04-20 10:57:46 +08:00
caishi	2d2deec224	Merge branch 'develop'	2021-04-20 10:56:50 +08:00
caishi	8c58f77afb	去掉右侧悬浮手册按钮	2021-04-09 14:18:44 +08:00