diff options
| author | Erik Johnston <erik@matrix.org> | 2014-08-15 17:50:27 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-08-15 17:50:27 +0100 |
| commit | 7f5c7ddea9db879e500a48b47ad4f782d2d8416b (patch) | |
| tree | 3332c614902b5641451da530ac9d2a3bed538a15 /webclient/rooms/rooms.html | |
| parent | Fix some of the tests to reflect changes in the storage layer. (diff) | |
| parent | Get presence for members when you enter a room (it was coming down but wasn't... (diff) | |
| download | synapse-7f5c7ddea9db879e500a48b47ad4f782d2d8416b.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Diffstat (limited to 'webclient/rooms/rooms.html')
| -rw-r--r-- | webclient/rooms/rooms.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webclient/rooms/rooms.html b/webclient/rooms/rooms.html index 5974bd940c..c3ee85f8a0 100644 --- a/webclient/rooms/rooms.html +++ b/webclient/rooms/rooms.html @@ -61,9 +61,9 @@ <h3>My rooms</h3> - <div class="rooms" ng-repeat="room in rooms"> + <div class="rooms" ng-repeat="(rm_id, room) in rooms"> <div> - <a href="#/room/{{ room.room_id }}" >{{ room.room_alias }}</a> + <a href="#/room/{{ rm_id }}" >{{ room.room_alias }}</a> {{room.membership === 'invite' ? ' (invited)' : ''}} </div> </div> <br/> @@ -86,7 +86,7 @@ </div> <div> <form> - <input size="40" ng-model="joinAlias.room_alias" ng-enter="joinAlias(joinAlias.room_alias)" placeholder="(e.g. #foo_channe:example.org)"/> + <input size="40" ng-model="joinAlias.room_alias" ng-enter="joinAlias(joinAlias.room_alias)" placeholder="(e.g. #foo_channel:example.org)"/> <button ng-disabled="!joinAlias.room_alias" ng-click="joinAlias(joinAlias.room_alias)">Join room</button> </form> </div> |