From 3108accdee0fe588b506d6cd38aaf89a409abb7f Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Thu, 18 Sep 2014 16:31:18 +0100 Subject: [PATCH 1/2] Remove lie from change log. --- CHANGES.rst | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGES.rst b/CHANGES.rst index 9e884e51bf..dd188cf86a 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -41,7 +41,6 @@ Webclient: * The recents list now differentiates between public & private rooms. * Fix bug where when switching between rooms the pagination flickered before the view jumped to the bottom of the screen. - * Add support for password resets. * Add bing word support. Registration API: From 270825ab2a3e16bb8ffcdbcea058efd28a38e8e1 Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 19 Sep 2014 11:41:49 +0100 Subject: [PATCH 2/2] Fix undefined variable error --- webclient/components/matrix/matrix-call.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webclient/components/matrix/matrix-call.js b/webclient/components/matrix/matrix-call.js index 2ecb8b05ff..d05047eebb 100644 --- a/webclient/components/matrix/matrix-call.js +++ b/webclient/components/matrix/matrix-call.js @@ -429,7 +429,7 @@ angular.module('MatrixCall', []) } if (this.candidateSendTries > 5) { - console.log("Failed to send candidates on attempt "+ev.tries+". Giving up for now."); + console.log("Failed to send candidates on attempt "+this.candidateSendTries+". Giving up for now."); this.candidateSendTries = 0; return; }