Merge branch 'master' into PLT-2115

1 files changed, 0 insertions, 66 deletions

diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx
deleted file mode 100644
index ec9080945..000000000
--- a/web/react/pages/login.jsx
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-import * as Client from '../utils/client.jsx';
-import Login from '../components/login.jsx';
-
-var IntlProvider = ReactIntl.IntlProvider;
-
-class Root extends React.Component {
-    constructor() {
-        super();
-        this.state = {
-            translations: null,
-            loaded: false
-        };
-    }
-
-    static propTypes() {
-        return {
-            map: React.PropTypes.object.isRequired
-        };
-    }
-
-    componentWillMount() {
-        Client.getTranslations(
-            this.props.map.Locale,
-            (data) => {
-                this.setState({
-                    translations: data,
-                    loaded: true
-                });
-            },
-            () => {
-                this.setState({
-                    loaded: true
-                });
-            }
-        );
-    }
-
-    render() {
-        if (!this.state.loaded) {
-            return <div></div>;
-        }
-
-        return (
-            <IntlProvider
-                locale={this.props.map.Locale}
-                messages={this.state.translations}
-            >
-                <Login
-                    teamDisplayName={this.props.map.TeamDisplayName}
-                    teamName={this.props.map.TeamName}
-                    inviteId={this.props.map.InviteId}
-                />
-            </IntlProvider>
-        );
-    }
-}
-
-global.window.setup_login_page = function setup(props) {
-    ReactDOM.render(
-        <Root map={props}/>,
-        document.getElementById('login')
-    );
-};
\ No newline at end of file