Merge remote-tracking branch 'origin/develop' into develop

src/components/views/elements/EditableItemList.js

@@ -84,7 +84,9 @@ module.exports = React.createClass({
         onNewItemChanged: PropTypes.func,
         onItemAdded: PropTypes.func,
         onItemEdited: PropTypes.func,
-        onItemRemoved: PropTypes. func,
+        onItemRemoved: PropTypes.func,
+
+        canEdit: PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -136,6 +138,7 @@ module.exports = React.createClass({
                 { label }
             </div>
             { editableItems }
+            { this.props.canEdit ?
                 <EditableItem
                     key={-1}
                     initialValue={this.props.newItem}
@@ -143,7 +146,8 @@ module.exports = React.createClass({
                     onChange={this.onNewItemChanged}
                     addOnChange={true}
                     placeholder={this.props.placeholder}
-            />
+                /> : <div />
+            }
         </div>);
     },
 });

src/components/views/room_settings/AliasSettings.js

@@ -262,6 +262,7 @@ module.exports = React.createClass({
                     items={this.state.domainToAliases[localDomain] || []}
                     newItem={this.state.newAlias}
                     onNewItemChanged={this.onNewAliasChanged}
+                    canEdit={this.props.canSetAliases}
                     onItemAdded={this.onLocalAliasAdded}
                     onItemEdited={this.onLocalAliasChanged}
                     onItemRemoved={this.onLocalAliasDeleted}

src/components/views/room_settings/RelatedGroupSettings.js

@@ -27,7 +27,7 @@ module.exports = React.createClass({
 
     propTypes: {
         roomId: React.PropTypes.string.isRequired,
-        canSetRelatedRooms: React.PropTypes.bool.isRequired,
+        canSetRelatedGroups: React.PropTypes.bool.isRequired,
         relatedGroupsEvent: React.PropTypes.instanceOf(MatrixEvent),
     },
 
@@ -37,7 +37,7 @@ module.exports = React.createClass({
 
     getDefaultProps: function() {
         return {
-            canSetRelatedRooms: false,
+            canSetRelatedGroups: false,
         };
     },
 
@@ -110,6 +110,7 @@ module.exports = React.createClass({
                 items={this.state.newGroupsList}
                 className={"mx_RelatedGroupSettings"}
                 newItem={this.state.newGroupId}
+                canEdit={this.props.canSetRelatedGroups}
                 onNewItemChanged={this.onNewGroupChanged}
                 onItemAdded={this.onGroupAdded}
                 onItemEdited={this.onGroupEdited}

src/components/views/rooms/RoomSettings.js

@@ -19,7 +19,6 @@ import Promise from 'bluebird';
 import React from 'react';
 import { _t, _tJsx, _td } from '../../../languageHandler';
 import MatrixClientPeg from '../../../MatrixClientPeg';
-import SdkConfig from '../../../SdkConfig';
 import sdk from '../../../index';
 import Modal from '../../../Modal';
 import ObjectUtils from '../../../ObjectUtils';