Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix

This commit is contained in:
David Jay
2017-01-27 15:21:47 -05:00
5 changed files with 4 additions and 5 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ program
.description('initilizes the talk settings')
.action(() => {
const defaults = {
moderation: 'PRE',
moderation: 'POST',
wordlist: {
banned: [],
suspect: []
@@ -24,7 +24,6 @@ const UserAction = props => {
<li tabIndex={props.index} className={`mdl-card mdl-shadow--2dp ${styles.listItem} ${props.isActive && !props.hideActive ? styles.activeItem : ''}`}>
<div className={styles.itemHeader}>
<div className={styles.author}>
<i className={`material-icons ${styles.avatar}`}>person</i>
<span>{user.displayName}</span>
</div>
<div className={styles.sideActions}>
+1 -1
View File
@@ -1,7 +1,7 @@
import React, {Component} from 'react';
import {compose} from 'react-apollo';
import {connect} from 'react-redux';
import {isEqual} from 'lodash';
import isEqual from 'lodash/isEqual';
import {TabBar, Tab, TabContent, Spinner} from '../../coral-ui';
+1 -1
View File
@@ -4,7 +4,7 @@ module.exports = () => Promise.all([
// Upsert the settings object.
SettingsService.init({
moderation: 'PRE',
moderation: 'POST',
wordlist: {
banned: [],
suspect: []
+1 -1
View File
@@ -23,7 +23,7 @@ const SettingSchema = new Schema({
'PRE',
'POST'
],
default: 'PRE'
default: 'POST'
},
infoBoxEnable: {
type: Boolean,