Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-05 23:14:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into user_page

Browse source
This commit is contained in:
Emmanuel ROHEE 2014-08-19 09:44:50 +02:00
commit ff21d4d93b
7 changed files with 188 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
webclient/room/room-controller.js
View file

@ -147,7 +147,7 @@ angular.module('RoomController', ['ngSanitize'])
if (document.hidden) {
var notification = new window.Notification(
($scope.members[event.user_id].displayname || event.user_id) +
" (" + $scope.room_alias + ")",
" (" + ($scope.room_alias || $scope.room_id) + ")", // FIXME: don't leak room_ids here
{
"body": event.content.body,
"icon": $scope.members[event.user_id].avatar_url,