Merge pull request #393 from matrix-org/dbkr/enable_labs

Add config to hide the labs section

src/components/structures/MatrixChat.js

@@ -1062,7 +1062,12 @@ module.exports = React.createClass({
                     right_panel = <RightPanel roomId={this.state.currentRoomId} collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity} />
                     break;
                 case this.PageTypes.UserSettings:
-                    page_element = <UserSettings onClose={this.onUserSettingsClose} version={this.state.version} brand={this.props.config.brand} />
+                    page_element = <UserSettings
+                        onClose={this.onUserSettingsClose}
+                        version={this.state.version}
+                        brand={this.props.config.brand}
+                        enableLabs={this.props.config.enableLabs}
+                    />
                     right_panel = <RightPanel collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity}/>
                     break;
                 case this.PageTypes.CreateRoom:

src/components/structures/UserSettings.js

@@ -54,11 +54,15 @@ module.exports = React.createClass({
         onClose: React.PropTypes.func,
         // The brand string given when creating email pushers
         brand: React.PropTypes.string,
+
+        // True to show the 'labs' section of experimental features
+        enableLabs: React.PropTypes.bool,
     },
 
     getDefaultProps: function() {
         return {
-            onClose: function() {}
+            onClose: function() {},
+            enableLabs: true,
         };
     },
 
@@ -363,6 +367,9 @@ module.exports = React.createClass({
     },
 
     _renderLabs: function () {
+        // default to enabled if undefined
+        if (this.props.enableLabs === false) return null;
+
         let features = LABS_FEATURES.map(feature => (
             <div key={feature.id} className="mx_UserSettings_toggle">
                 <input