diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-12 18:19:32 +0100 |
| commit | e3aec9bc818e203a4883f8863acb96b9c273112a (patch) | |
| tree | 762f87365f917f510f00bc6aee7a4068cdd56e76 /webclient/recents/recents.html | |
| parent | fix embarassing bug where in-progress messages get vaped when the previous on... (diff) | |
| parent | Bump version and change log (diff) | |
| download | synapse-e3aec9bc818e203a4883f8863acb96b9c273112a.tar.xz | |
Merge branch 'release-v0.2.3' of github.com:matrix-org/synapse
Conflicts: webclient/room/room-controller.js
Diffstat (limited to 'webclient/recents/recents.html')
| -rw-r--r-- | webclient/recents/recents.html | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html index 280d0632ab..3d736b6694 100644 --- a/webclient/recents/recents.html +++ b/webclient/recents/recents.html @@ -9,12 +9,17 @@ {{ room.room_id | mRoomName }} </td> <td class="recentsRoomSummaryTS"> + <span ng-show="undefined !== room.numUsersInRoom"> + {{ room.numUsersInRoom || '1' }} {{ room.numUsersInRoom == 1 ? 'user' : 'users' }} + </span> + </td> + <td class="recentsRoomSummaryTS"> {{ (room.lastMsg.ts) | date:'MMM d HH:mm' }} </td> </tr> <tr> - <td colspan="2" class="recentsRoomSummary"> + <td colspan="3" class="recentsRoomSummary"> <div ng-show="room.membership === 'invite'"> {{ room.lastMsg.inviter | mUserDisplayName: room.room_id }} invited you @@ -61,7 +66,7 @@ </div> <div ng-switch-when="m.emote"> - <span ng-bind-html="'* ' + (room.lastMsg.user_id) + ' ' + room.lastMsg.content.body | linky:'_blank'"> + <span ng-bind-html="'* ' + (room.lastMsg.user_id | mUserDisplayName: room.room_id) + ' ' + room.lastMsg.content.body | linky:'_blank'"> </span> </div> @@ -71,6 +76,14 @@ </div> </div> + <div ng-switch-when="m.room.topic"> + {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} changed the topic to: {{ room.lastMsg.content.topic }} + </div> + + <div ng-switch-when="m.room.name"> + {{ room.lastMsg.user_id | mUserDisplayName: room.room_id }} changed the room name to: {{ room.lastMsg.content.name }} + </div> + <div ng-switch-default> <div ng-if="room.lastMsg.type.indexOf('m.call.') === 0"> Call |