summary refs log tree commit diff
path: root/webclient/index.html
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-08-27 15:34:01 +0100
committerErik Johnston <erik@matrix.org>2014-08-27 15:34:01 +0100
commit08881d808d7cfd600d130eb7a960c6c51c797a09 (patch)
tree1a8c8833a981b9a01e5f8c68c555203f2bc59455 /webclient/index.html
parentIndex sources in a nicer fashion. (diff)
parentBF: use room_id if there is no alias (diff)
downloadsynapse-08881d808d7cfd600d130eb7a960c6c51c797a09.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into stream_refactor
Diffstat (limited to 'webclient/index.html')
-rw-r--r--webclient/index.html4
1 files changed, 3 insertions, 1 deletions
diff --git a/webclient/index.html b/webclient/index.html

index 6031036e9a..16f0e8ac5f 100644 --- a/webclient/index.html +++ b/webclient/index.html
@@ -19,6 +19,8 @@ <script src="app-filter.js"></script> <script src="home/home-controller.js"></script> <script src="login/login-controller.js"></script> + <script src="recents/recents-controller.js"></script> + <script src="recents/recents-filter.js"></script> <script src="room/room-controller.js"></script> <script src="room/room-directive.js"></script> <script src="settings/settings-controller.js"></script> @@ -37,7 +39,7 @@ <header id="header"> <!-- Do not show buttons on the login page --> <div id="header-buttons" ng-hide="'/login' == location "> - <button ng-click='go("settings")'>Settings</button> + <button ng-click='goToPage("settings")'>Settings</button> <button ng-click="logout()">Log out</button> </div> </header>