diff options
| author | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-17 16:59:24 +0000 |
|---|---|---|
| committer | Paul "LeoNerd" Evans <paul@matrix.org> | 2014-11-17 16:59:24 +0000 |
| commit | 31a049eb692d37387a2db972da754f7ec56218c7 (patch) | |
| tree | 9e5f47abad904d30c08d2f340b543a631e436894 /syweb/webclient/user/user.html | |
| parent | Include room membership in room initialSync (diff) | |
| parent | SYN-148: Add the alias after creating the room (diff) | |
| download | synapse-31a049eb692d37387a2db972da754f7ec56218c7.tar.xz | |
Merge branch 'develop' into room-initial-sync
Conflicts: synapse/handlers/message.py
Diffstat (limited to 'syweb/webclient/user/user.html')
| -rw-r--r-- | syweb/webclient/user/user.html | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/syweb/webclient/user/user.html b/syweb/webclient/user/user.html deleted file mode 100644 index 2aa981437b..0000000000 --- a/syweb/webclient/user/user.html +++ /dev/null @@ -1,25 +0,0 @@ -<div ng-controller="UserController" class="user"> - - <div id="wrapper"> - - <div id="genericHeading"> - <a href ng-click="goToPage('/')"><img src="img/logo-small.png" width="100" height="43" alt="[matrix]"/></a> - </div> - - <h1>{{ user.displayname || user.id }}</h1> - - <div> - <div class="profile-avatar"> - <img ng-src="{{ user.avatar_url || 'img/default-profile.png' }}"/> - </div> - <div id="user-ids"> - <div>{{ user.id }}</div> - </div> - </div> - - <button ng-hide="user.id == user_id" ng-click="messageUser()" style="font-size: 14pt; margin-top: 40px; margin-bottom: 40px">Start chat</button> - <br/> - {{ feedback }} - - </div> -</div> |