Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:matrix-org/synapse into develop

This commit is contained in:
Erik Johnston 2014-09-22 13:02:47 +01:00
parent 4696622b0a 270825ab2a
commit e68dc04900
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.rst
View File

@ -41,7 +41,6 @@ Webclient:
* The recents list now differentiates between public & private rooms. * The recents list now differentiates between public & private rooms.
* Fix bug where when switching between rooms the pagination flickered before * Fix bug where when switching between rooms the pagination flickered before
the view jumped to the bottom of the screen. the view jumped to the bottom of the screen.
* Add support for password resets.
* Add bing word support. * Add bing word support.
Registration API: Registration API:

2
webclient/components/matrix/matrix-call.js
View File

@ -537,7 +537,7 @@ angular.module('MatrixCall', [])
} }
if (this.candidateSendTries > 5) { 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; this.candidateSendTries = 0;
return; return;
} }