Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/common/UrlTool.js

@@ -46,6 +46,9 @@ export function getUrl2(path, goTest) {
 export function getUploadActionUrl(path, goTest) {
 	return `${getUrl()}/api/attachments.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}`
 }
+export function getUploadActionUrlOfAuth(id) {
+	return `${getUrl()}/api/users/accounts/${id}/auth_attachments.json${isDev ? `?debug=${window._debugType || 'admin'}` : ''}`
+}
 
 export function test(path) {
 	return `${path}`;

public/react/src/modules/courses/boards/TopicDetail.js

@@ -648,7 +648,9 @@ class TopicDetail extends Component {
 
                     
                     <div className="padding30 memoContent new_li" style={{ paddingBottom: '10px'}}>
-                      <MarkdownToHtml content={memo.content}></MarkdownToHtml>
+                      {memo.is_md == true ? <MarkdownToHtml content={memo.content}></MarkdownToHtml> : 
+                        <div dangerouslySetInnerHTML={{ __html: memo.content }}></div>
+                      }
                     </div>
                     <div className="padding30 bor-bottom-greyE" style={{paddingTop: '2px'}}>
                         <div className="mt10 mb20">

public/react/src/modules/login/Trialapplicationysl.js

@@ -86,7 +86,7 @@ class Trialapplicationysl extends Component {
 		// console.log("53");
 		//
 		// console.log(this.props.isRenders);
-		this.getipthon();
+		// this.getipthon();
 		if (this.props.isRenders != undefined) {
 			this.setState({
 				isRenders: this.props.isRenders