Commit 068d515b authored by Juorder Gonzalez quiñonez's avatar Juorder Gonzalez quiñonez

Merge branch 'develop' of https://github.com/ZBoxApp/manager-react into develop

parents d53f25c7 c532b6df
......@@ -31,7 +31,6 @@ import ZimbraStore from '../../stores/zimbra_store.jsx';
const QueryOptions = Constants.QueryOptions;
const messageType = Constants.MessageType;
const codes = Constants.ZimbraCodes;
export default class Mailboxes extends React.Component {
constructor(props) {
......@@ -270,7 +269,7 @@ export default class Mailboxes extends React.Component {
domain: domainName,
loading: false
});
}).catch(console.error.bind('error'));
}).catch((err) => err);
}
getAllMailboxes(domainId) {
......
......@@ -47,7 +47,8 @@ export default class PanelActions extends React.Component {
e.preventDefault();
if (this.props.onExport) {
return this.props.onExport(this.state['items' + this.props.name]);
const { data: items } = this.props;
return this.props.onExport(items);
}
throw new Error('onExport function was not defined, onExport :' + this.props.onExport);
......
......@@ -47,7 +47,8 @@ export default class PanelActions extends React.Component {
e.preventDefault();
if (this.props.onExport) {
return this.props.onExport(this.state['items' + this.props.name]);
const { data: items } = this.props;
return this.props.onExport(items);
}
throw new Error('onExport function was not defined, onExport :' + this.props.onExport);
......
......@@ -31,7 +31,6 @@ import * as Client from './utils/client.jsx';
import * as Utils from './utils/utils.jsx';
import Constants from './utils/constants.jsx';
import $ from 'jquery';
import React from 'react';
import ReactDOM from 'react-dom';
import {Router, Route, IndexRedirect, Redirect, browserHistory} from 'react-router';
......
.datepicker-days {
padding: 10px 10px 0px 10px;
padding: 10px 10px 0;
.switch {
text-align: center;
}
.today {
color: #337ab7;
color: $color-active-day;
}
.day {
......@@ -18,7 +18,7 @@
}
.active {
color: #FFF;
background-color: #337ab7;
background-color: $color-active-day;
color: $white;
}
}
......@@ -27,6 +27,7 @@ $color-yellow: #ffb606;
$color-orange: #e67e22;
$color-red: #e74c3c;
$color-red-deep: #c0392b;
$color-active-day: #337ab7;
// Additional colors
$color-text: #6a6c6f;
......
......@@ -881,6 +881,7 @@ export function getConfigName() {
}
export function isDevMode() {
// eslint-disable-next-line
return process.env.NODE_ENV === 'development';
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment