From b4e1c1f51e42dee478443323a331499ce91cf8a7 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 5 Sep 2014 12:46:48 -0700
Subject: [PATCH 1/5] Minor spec tweaks.

---
 docs/specification.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/specification.rst b/docs/specification.rst
index 239e51b4f..a329c0754 100644
--- a/docs/specification.rst
+++ b/docs/specification.rst
@@ -742,15 +742,17 @@ There are several APIs provided to ``GET`` events for a room:
   Description:
     Get all ``m.room.member`` state events.
   Response format:
-    ``{ "start": "token", "end": "token", "chunk": [ { m.room.member event }, ... ] }``
+    ``{ "start": "<token>", "end": "<token>", "chunk": [ { m.room.member event }, ... ] }``
   Example:
     TODO
 
 |/rooms/<room_id>/messages|_
   Description:
-    Get all ``m.room.message`` events.
+    Get all ``m.room.message`` and ``m.room.member`` events. This API supports pagination
+	using ``from`` and ``to`` query parameters, coupled with the ``start`` and ``end``
+	tokens from an |initialSync|_ API.
   Response format:
-    ``{ TODO }``
+    ``{ "start": "<token>", "end": "<token>" }``
   Example:
     TODO
     

From 64b6f09b0d2136394deb46c83e9ba55f044fcbec Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Sat, 6 Sep 2014 17:48:16 -0700
Subject: [PATCH 2/5] fix embarassing bug where in-progress messages get vaped
 when the previous one gets delivered

---
 webclient/room/room-controller.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/webclient/room/room-controller.js b/webclient/room/room-controller.js
index c702917fe..c8ca771b2 100644
--- a/webclient/room/room-controller.js
+++ b/webclient/room/room-controller.js
@@ -485,7 +485,9 @@ angular.module('RoomController', ['ngSanitize', 'matrixFilter', 'mFileInput'])
             promise.then(
                 function() {
                     console.log("Request successfully sent");
-                    $scope.textInput = "";
+                    if (!echo) {
+                        $scope.textInput = "";
+                    }
 /*
                     if (echoMessage) {
                         // Remove the fake echo message from the room messages

From afb7f173cf3f04ffe212025910a950814d1761bc Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 12 Sep 2014 18:13:05 +0100
Subject: [PATCH 3/5] Bump version and change log

---
 CHANGES.rst         | 19 +++++++++++++++++++
 VERSION             |  2 +-
 synapse/__init__.py |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index b9b3e9d0e..ec53438f5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,22 @@
+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 reliabilty improvements.
+ * 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 ee1372d33..717903969 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.2
+0.2.3
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1ed9cdcdf..d60267ebe 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"

From 84326e24913132b96f2bb289fe560c0e053b65cf Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 12 Sep 2014 18:26:19 +0100
Subject: [PATCH 4/5] Add note about glare support

---
 CHANGES.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index ec53438f5..3076b29c7 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -14,6 +14,7 @@ Webclient:
  * Display information about rooms on the main page.
  * Handle ban and kick events in real time.
  * VoIP UI and reliabilty improvements.
+ * Add glare support for VoIP.
  * Improvements to initial startup speed.
  * Don't display duplicate join events.
 

From 80852d11351d27de35f85041df5e5da93528738d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 12 Sep 2014 18:27:04 +0100
Subject: [PATCH 5/5] Spellcheck

---
 CHANGES.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 3076b29c7..e602ad6f8 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -13,7 +13,7 @@ Webclient:
  * 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 reliabilty improvements.
+ * VoIP UI and reliability improvements.
  * Add glare support for VoIP.
  * Improvements to initial startup speed.
  * Don't display duplicate join events.