From b4be8eb554d4de1de5b4928a37cb72c34d565487 Mon Sep 17 00:00:00 2001
From: Reed Garmsen <rgarmsen2295@gmail.com>
Date: Mon, 21 Sep 2015 17:03:08 -0700
Subject: Minor changes to how resend status is passed

---
 web/react/pages/verify.jsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web/react/pages')

diff --git a/web/react/pages/verify.jsx b/web/react/pages/verify.jsx
index e48471bbd..16a9846e5 100644
--- a/web/react/pages/verify.jsx
+++ b/web/react/pages/verify.jsx
@@ -9,6 +9,7 @@ global.window.setupVerifyPage = function setupVerifyPage(props) {
             isVerified={props.IsVerified}
             teamURL={props.TeamURL}
             userEmail={props.UserEmail}
+            resendSuccess={props.ResendSuccess}
         />,
         document.getElementById('verify')
     );
-- 
cgit v1.2.3-1-g7c22


From e4a15076f458be1416de25b2c45578975b914de5 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Wed, 23 Sep 2015 10:12:40 -0400
Subject: Implement UI theme colors.

---
 web/react/pages/channel.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'web/react/pages')

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index d24fe0b98..07207c556 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -34,6 +34,7 @@ var ActivityLogModal = require('../components/activity_log_modal.jsx');
 var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx');
 var FileUploadOverlay = require('../components/file_upload_overlay.jsx');
 var RegisterAppModal = require('../components/register_app_modal.jsx');
+var ImportThemeModal = require('../components/user_settings/import_theme_modal.jsx');
 
 var Constants = require('../utils/constants.jsx');
 var ActionTypes = Constants.ActionTypes;
@@ -84,6 +85,11 @@ function setupChannelPage(props) {
         document.getElementById('user_settings_modal')
     );
 
+    React.render(
+        <ImportThemeModal />,
+        document.getElementById('import_theme_modal')
+    );
+
     React.render(
         <TeamSettingsModal teamDisplayName={props.TeamDisplayName} />,
         document.getElementById('team_settings_modal')
-- 
cgit v1.2.3-1-g7c22