Merge remote-tracking branch 'origin/develop' into rav/hotkey-ux

2017-01-24 20:47:24 +00:00
parent b323551f22 55591f2019
commit 6dd46d532a
124 changed files with 1837 additions and 654 deletions
@@ -60,7 +60,7 @@ module.exports = React.createClass({
    getInitialState: function() {
        return {
            phase: this.Phases.Edit
-        }
+        };
    },

    changePassword: function(old_password, new_password) {
@@ -106,7 +106,7 @@ module.exports = React.createClass({
    render: function() {
        var rowClassName = this.props.rowClassName;
        var rowLabelClassName = this.props.rowLabelClassName;
-        var rowInputClassName = this.props.rowInputClassName
+        var rowInputClassName = this.props.rowInputClassName;
        var buttonClassName = this.props.buttonClassName;

        switch (this.state.phase) {