haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-07 18:03:48 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.3'

Browse Source 
Conflicts:
	frontend/src/components/MainPanel.js
	frontend/src/components/account.js
	frontend/src/components/main-panel.js
	frontend/src/components/search.js
	frontend/src/pages/wiki/main-panel.js
	frontend/src/pages/wiki/side-panel.js
	frontend/src/wiki.js
This commit is contained in:
ilearnit
2018-09-04 18:15:48 +08:00
parent 5ec002c98a 7015929a33
commit 2e01046493
106 changed files with 20198 additions and 22705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/account.js
View File

@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import ReactDOM from 'react-dom';
import cookie from 'react-cookies';
import { keyCodes, bytesToSize } from './utils';
import editorUtilities from '../utils/editor-utilties';
const siteRoot = window.app.config.siteRoot;
const gettext = window.gettext;
@@ -73,7 +73,7 @@ class Account extends Component {
}
getAccountInfo = () => {
this.props.seafileAPI.getAccountInfo().then(resp => {
editorUtilities.getAccountInfo().then(resp => {
this.setState({
userName: resp.data.name,
contactEmail: resp.data.email,