Merge branches 'develop' and 't3chguy/pl_control_e2e' of github.com:matrix-org/matrix-react-sdk into t3chguy/pl_control_e2e

Conflicts: src/components/views/settings/tabs/room/RolesRoomSettingsTab.js src/i18n/strings/en_EN.json
2019-08-30 10:56:47 +01:00
parent 66714b29af 27fdef557d
commit 8967871b23
37 changed files with 695 additions and 193 deletions
@@ -30,6 +30,7 @@ const plEventsToLabels = {
    "m.room.history_visibility": _td("Change history visibility"),
    "m.room.power_levels": _td("Change permissions"),
    "m.room.topic": _td("Change topic"),
+    "m.room.tombstone": _td("Upgrade the room"),
    "m.room.encryption": _td("Enable room encryption"),

    "im.vector.modular.widgets": _td("Modify widgets"),
@@ -43,6 +44,7 @@ const plEventsToShow = {
    "m.room.history_visibility": {isState: true},
    "m.room.power_levels": {isState: true},
    "m.room.topic": {isState: true},
+    "m.room.tombstone": {isState: true},
    "m.room.encryption": {isState: true},

    "im.vector.modular.widgets": {isState: true},