wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-15 12:55:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge Issues

Browse Source
This commit is contained in:
Belen Curcio
2016-11-17 11:00:35 -03:00
parent f1320c7f04
commit a8f28f64b7
10 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-admin/src/components/Comment.js
+1 -1
View File
@@ -3,7 +3,7 @@ import React from 'react';
import {Button, Icon} from 'react-mdl';
import timeago from 'timeago.js';
import styles from './CommentList.css';
import I18n from 'coral-framework/i18n/i18n';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../translations.json';
// Render a single comment for the list
client/coral-admin/src/components/Header.js
+1 -1
View File
@@ -2,7 +2,7 @@ import React from 'react';
import {Layout, Navigation, Drawer, Header} from 'react-mdl';
import {Link} from 'react-router';
import styles from './Header.css';
import I18n from 'coral-framework/i18n/i18n';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../translations.json';
// App header. If we add a navbar it should be here
client/coral-admin/src/components/ModerationKeysModal.js
+1 -1
View File
@@ -1,4 +1,4 @@
import I18n from 'coral-framework/i18n/i18n';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../translations.json';
import React from 'react';
import Modal from 'components/Modal';
client/coral-admin/src/components/ui/Drawer.js
+1 -1
View File
@@ -2,7 +2,7 @@ import React from 'react';
import {Navigation, Drawer} from 'react-mdl';
import {Link} from 'react-router';
import styles from './Header.css';
import I18n from 'coral-framework/i18n/i18n';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../../translations.json';
export default () => (
client/coral-admin/src/components/ui/Header.js
+1 -1
View File
@@ -2,7 +2,7 @@ import React from 'react';
import {Navigation, Header} from 'react-mdl';
import {Link} from 'react-router';
import styles from './Header.css';
import I18n from 'coral-framework/i18n/i18n';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../../translations.json';
export default () => (
client/coral-admin/src/containers/Community/Community.js
+1 -1
View File
@@ -1,5 +1,5 @@
import React from 'react';
import I18n from 'coral-framework/i18n/i18n';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../../translations.json';
import {Grid, Cell} from 'react-mdl';
client/coral-admin/src/containers/Community/Table.js
+1 -1
View File
@@ -2,7 +2,7 @@ import React, {Component} from 'react';
import {connect} from 'react-redux';
import {SelectField, Option} from 'react-mdl-selectfield';
import styles from './Community.css';
import I18n from 'coral-framework/i18n/i18n';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../../translations';
import {setRole} from '../../actions/community';
client/coral-admin/src/containers/Configure.js
+1 -1
View File
@@ -13,7 +13,7 @@ import {
Icon
} from 'react-mdl';
import styles from './Configure.css';
import I18n from 'coral-framework/i18n/i18n';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../translations.json';
class Configure extends React.Component {
client/coral-admin/src/containers/ModerationQueue.js
+1 -1
View File
@@ -5,7 +5,7 @@ import CommentList from 'components/CommentList';
import {updateStatus} from 'actions/comments';
import styles from './ModerationQueue.css';
import key from 'keymaster';
import I18n from 'coral-framework/i18n/i18n';
import I18n from 'coral-framework/modules/i18n/i18n';
import translations from '../translations.json';
/*
client/coral-framework/reducers/auth.js
+1
View File
@@ -29,6 +29,7 @@ export default function auth (state = initialState, action) {
}));
case actions.CHANGE_VIEW :
return state
.set('signUpError', '')
.set('view', action.view);
case actions.CLEAN_STATE:
return initialState;