Merge branch 'develop' into server2server_tls

3 files changed, 9 insertions, 2 deletions

diff --git a/webclient/index.html b/webclient/index.html

index 3c31a8a051..bf24e392ac 100644
--- a/webclient/index.html
+++ b/webclient/index.html
@@ -56,7 +56,7 @@
 
     <div id="footer" ng-hide="location.indexOf('/room') == 0">
         <div id="footerContent">
-            &copy 2014 Matrix.org
+            &copy; 2014 Matrix.org
         </div>
     </div>
 </body>
diff --git a/webclient/recents/recents-controller.js b/webclient/recents/recents-controller.js

index d33d41a922..c9fd022d7f 100644
--- a/webclient/recents/recents-controller.js
+++ b/webclient/recents/recents-controller.js
@@ -43,6 +43,11 @@ angular.module('RecentsController', ['matrixService', 'eventHandlerService'])
                 $scope.rooms[event.room_id].lastMsg = event;              
             }
         });
+        $scope.$on(eventHandlerService.CALL_EVENT, function(ngEvent, event, isLive) {
+            if (isLive) {
+                $scope.rooms[event.room_id].lastMsg = event;
+            }
+        });
     };
 
     
diff --git a/webclient/recents/recents.html b/webclient/recents/recents.html

index 3f025a98d8..56fb38b02a 100644
--- a/webclient/recents/recents.html
+++ b/webclient/recents/recents.html
@@ -51,7 +51,9 @@
                         </div>
 
                         <div ng-switch-default>
-                            {{ room.lastMsg }}
+                            <div ng-if="room.lastMsg.type.indexOf('m.call.') == 0">
+                                Call
+                            </div>
                         </div>
                     </div>
                 </td>