imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix broken merge and revert some of 243b2e45 and document evil magic numbers

Browse source
This commit is contained in:
Matthew Hodgson 2016-01-15 14:22:17 +00:00
parent 7cc5925ec4
commit 4a2c2d9656
3 changed files with 61 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/components/views/rooms/RoomSettings.js
View file

@ -366,6 +366,12 @@ module.exports = React.createClass({
</div>;
}
var create_event = this.props.room.currentState.getStateEvents('m.room.create', '');
var unfederatable_section;
if (create_event.getContent()["m.federate"] === false) {
unfederatable_section = <div>Ths room is not accessible by remote Matrix servers</div>.
}
// TODO: support editing custom events_levels
// TODO: support editing custom user_levels
@ -383,6 +389,8 @@ module.exports = React.createClass({
</label> <br/>
<label className="mx_RoomSettings_encrypt"><input type="checkbox" /> Encrypt room</label>
{ unfederatable_section }
{ room_colors_section }
{ aliases_section }