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

CHANGES.rst

+Changes in synapse 0.2.3 (2014-09-12)
+=====================================
+
+Homeserver:
+ * Fix bug where we stopped sending events to remote home servers if a
+   user from that home server left, even if there were some still in the
+   room.
+ * Fix bugs in the state conflict resolution where it was incorrectly
+   rejecting events.
+
+Webclient:
+ * Display room names and topics.
+ * Allow setting/editing of room names and topics.
+ * Display information about rooms on the main page.
+ * Handle ban and kick events in real time.
+ * VoIP UI and reliability improvements.
+ * Add glare support for VoIP.
+ * Improvements to initial startup speed.
+ * Don't display duplicate join events.
+
 Changes in synapse 0.2.2 (2014-09-06)
 =====================================
 

VERSION

-0.2.2
+0.2.3

synapse/__init__.py

@@ -16,4 +16,4 @@
 """ This is a reference implementation of a synapse home server.
 """
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"

webclient/room/room-controller.js

@@ -598,6 +598,7 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
             promise.then(
                 function(response) {
                     console.log("Request successfully sent");
+
                     if (echo) {
                         // Mark this fake message event with its allocated event_id
                         // When the true message event will come from the events stream (in handleMessage),