Merge branch 'master' into PLT-11-email

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')

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')
     );