Merge branch 'develop'

src/forge/About/Index.jsx

@@ -117,7 +117,7 @@ function Index(props){
             {content ? 
               <RenderHtml className="break_word_comments imageLayerParent" value={content} url={props.history.location}/>
               :
-              <div>暂无简介~</div>
+              <div>暂无概览~</div>
             }
             {attachments && attachments.length > 0 &&
               <Attachments

src/forge/Component/Releases.jsx

@@ -24,7 +24,7 @@ function Releases({owner,projectsId,releaseVersions}){
               <i className="iconfont icon-biaoqian3 color-grey-6 font-18 mr10"></i>
               <div>
                 <p className="font-16 color-grey-6">
-                  <Link to={`/projects/${owner}/${projectsId}/releases/8/update`}>{item.name}</Link>
+                  <Link to={`/projects/${owner}/${projectsId}/releases`}>{item.name}</Link>
                   <span className="font-12 laterest ml5">最新</span>
                 </p>
                 <p className="color-grey-9 font-13">{item.created_at}</p>

src/forge/Main/Index.scss

@@ -227,7 +227,7 @@
           margin-bottom: 0px!important;
         }
       }
-      li{
+      & > li{
         height: 42px;
         display: flex;
         justify-content: space-between;

src/forge/Main/IndexItem.js

@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import { Tooltip } from 'antd';
 import { getImageUrl } from 'educoder';
+import { AlignCenter } from '../Component/layout';
 import { Link } from 'react-router-dom';
 import '../css/index.scss';
 import Nodata from '../Nodata';
@@ -33,8 +34,10 @@ class IndexItem extends Component {
               }
               <div className="p-r-Infos">
                 <div className="p-r-name">
-                  <Link to={`/projects/${item.author.login}/${item.identifier}`} className="hide-1 color-grey-3 font-18 task-hide " style={{ whiteSpace: "wrap", display: 'flex', width: 400 }}>
+                  <AlignCenter>
-                    {item.author.name}/{item.name}
+                    <Link to={`/projects/${item.author.login}/${item.identifier}`} className="color-grey-3 font-18 task-hide " style={{maxWidth: 490 }}>
+                      {item.author.name}/{item.name}
+                    </Link>
                     {
                       item.forked_from_project_id ?
                         <span className="ml5">
@@ -52,7 +55,7 @@ class IndexItem extends Component {
                         <i className="iconfont icon-jingxiang font-18 color-green" />
                       </span>:""
                     }
-                  </Link>
+                  </AlignCenter>
                   <span className="p-r-tags">
                     <span className="pariseTag"><img src={img_parise} alt="" className="pariseImg" />赞 {item.praises_count}</span>
                     <span><i className="iconfont icon-fork mr3 font-16" style={{ color: "#1B8FFF" }} />fork {item.forked_count}</span>

src/forge/Main/sub/UpdateDescModal.jsx

@@ -39,7 +39,7 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
           {getFieldDecorator("desc",{
             rules:[]
           })(
-            <TextArea placeholder="项目简介" rows={4} maxLength={200}/>
+            <TextArea placeholder="请输入项目简介" rows={4} maxLength={200}/>
           )}
         </Form.Item>
         <Form.Item label="website">

src/forge/Order/order.js

@@ -834,7 +834,7 @@ class order extends Component {
             )}
           {
             search_count > select_params.limit ?
-            <div className="mt30 mb10 edu-txt-center">
+            <div className="mt30 mb30 edu-txt-center">
               <Pagination
                 simple
                 defaultCurrent={select_params.page}

src/forge/Settings/Setting.js

@@ -232,6 +232,7 @@ class Setting extends Component {
 
     const { CategoryList, LanguageList, private_check ,loading , divertVisible , is_transfering, transfer } = this.state;
     let mirror = projectDetail && projectDetail.mirror;
+    let type = projectDetail && projectDetail.type;
     return (
       <div>
         <DivertModal 
@@ -311,7 +312,7 @@ class Setting extends Component {
                           <Checkbox 
                             key={key} 
                             value={item.index} 
-                            disabled={item.index === "home" || item.index === "activity" || item.index === "code" || (mirror && item.index === "pulls")}
+                            disabled={item.index === "home" || item.index === "activity" || item.index === "code" || (mirror && (type && type===2) && item.index === "pulls")}
                           >{item.name}</Checkbox>
                         )
                       })

src/forge/Version/version.js

@@ -103,8 +103,8 @@ class version extends Component {
     const { data , releases , isSpin } = this.state
 
     return (
-      <div className="main" style={{paddingTop:"0px"}}>
+      <div className="main" style={{padding:"0px"}}>
-        <div className="topWrapper">
+        <div className="topWrapper" style={{padding:"15px 20px"}}>
           <span className="font-18 color-grey-3">版本发布</span>
           {
             data && data.user_permission ?
@@ -113,7 +113,7 @@ class version extends Component {
           }
         </div>
         <div className="releasesVersion">
-          <Spin spinning={isSpin}><div style={{minHeight:"300px"}}>{this.renderList(releases)}</div></Spin>
+          <Spin spinning={isSpin}><div>{this.renderList(releases)}</div></Spin>
         </div>
       </div>
     )