Merge branch 'master' of github.com:matrix-org/synapse into develop
4 files changed, 23 insertions, 2 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index b9b3e9d0ea..e602ad6f85 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,23 @@
+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)
=====================================
diff --git a/VERSION b/VERSION
index ee1372d33a..7179039691 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.2
+0.2.3
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1ed9cdcdf3..d60267ebe4 100644
--- a/synapse/__init__.py
+++ b/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"
diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index 3cc127140b..45dfff95c2 100644
--- a/webclient/room/room-controller.js
+++ b/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),
|
