summary refs log tree commit diff
path: root/webclient/recents
diff options
context:
space:
mode:
authorEmmanuel ROHEE <erohee@amdocs.com>2014-09-03 11:38:24 +0200
committerEmmanuel ROHEE <erohee@amdocs.com>2014-09-03 11:38:24 +0200
commit4ba5b4b55d67b4188d551916e0707f456a6af787 (patch)
tree8b9c528414f17a05a47e4f48a8bc2ccea206ad45 /webclient/recents
parentPrefix API links with /docs/api/client-server so they should link through cor... (diff)
downloadsynapse-4ba5b4b55d67b4188d551916e0707f456a6af787.tar.xz
Do not show banned people in member list. Format ban events strings in room and recent flows
Diffstat (limited to 'webclient/recents')
-rw-r--r--webclient/recents/recents.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html

index db3b0fb32f..9978e08b13 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html
@@ -23,8 +23,8 @@ <div ng-hide="room.membership === 'invite'" ng-switch="room.lastMsg.type" > <div ng-switch-when="m.room.member"> {{ room.lastMsg.user_id }} - {{ {"join": "joined", "leave": "left", "invite": "invited"}[room.lastMsg.content.membership] }} - {{ room.lastMsg.content.membership === "invite" ? (room.lastMsg.state_key || '') : '' }} + {{ {"join": "joined", "leave": "left", "invite": "invited", "ban": "banned"}[msg.content.membership] }} + {{ (msg.content.membership === "invite" || msg.content.membership === "ban") ? (msg.state_key || '') : '' }} </div> <div ng-switch-when="m.room.message">