From 13e29a697caf1ea1c421a34c42697cef2ef0b21a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 15 Mar 2016 09:43:32 +0000
Subject: [PATCH 1/5] Bump version and changelog

---
 CHANGES.rst         | 39 +++++++++++++++++++++++++++++++++++++++
 synapse/__init__.py |  2 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index bebf489e2..13fdf491b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,42 @@
+Changes in synapse v0.14.0-rc1 (2016-03-14)
+===========================================
+
+Features:
+
+* Add event_id to response to state event PUT (PR #581)
+* Allow guest users to access to messages in rooms they have joined (PR #587)
+* Add config for what state is included in a room invite (PR #598)
+* Send the inviter's member event in room invite state (PR #607)
+* Add error codes for malformed/bad JSON in /login (PR #608)
+* Add support for changing the actions for default rules (PR #609)
+* Add environment variable SYNAPSE_CACHE_FACTOR, default it to 0.1 (PR #612)
+* Add ability for alias creators to delete aliases (PR #614)
+* Add profile information to invites (PR #624)
+
+Changes:
+
+* Enforce user_id exclusivity for AS registrations (PR #572)
+* Make adding push rules idempotent (PR #587)
+* Improve presence performance (PR #582, #586)
+* Change presence semantics for ``last_active_ago`` (PR #582, #586)
+* Don't allow ``m.room.create`` to be changed (PR #596)
+* Add 800x600 to default list of valid thumbnail sizes (PR #616)
+* Always include kicks and bans in full /sync (PR #625)
+* Send history visibility on boundary changes (PR #626)
+* Register endpoint now returns a refresh_token (PR #637)
+
+Bug fixes:
+
+* Fix bug where we returned incorrect state in /sync (PR #573)
+* Always return a JSON object from push rule API (PR #606)
+* Fix bug where registering without a user id sometimes failed (PR #610)
+* Report size of ExpiringCache in cache size metrics (PR #611)
+* Fix rejection of invites to empty rooms (PR #615)
+* Fix usage of ``bcrypt`` to not use ``checkpw`` (PR #619)
+* Pin ``pysaml2`` dependency (PR #634)
+* Fix bug in ``/sync`` where timeline order was incorrect for backfilled events
+  (PR #635)
+
 Changes in synapse v0.13.3 (2016-02-11)
 =======================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index bc50bec9d..67fbc3a33 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.13.3"
+__version__ = "0.14.0-rc1"

From 5ca695cc124142b4230d530fbde4342722bace18 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Tue, 15 Mar 2016 09:48:10 +0000
Subject: [PATCH 2/5] English

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

diff --git a/CHANGES.rst b/CHANGES.rst
index 13fdf491b..45d9cf30b 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,7 @@ Changes in synapse v0.14.0-rc1 (2016-03-14)
 Features:
 
 * Add event_id to response to state event PUT (PR #581)
-* Allow guest users to access to messages in rooms they have joined (PR #587)
+* Allow guest users access to messages in rooms they have joined (PR #587)
 * Add config for what state is included in a room invite (PR #598)
 * Send the inviter's member event in room invite state (PR #607)
 * Add error codes for malformed/bad JSON in /login (PR #608)

From 15844040c236fd3b7199286533239051c9a9b7ea Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 23 Mar 2016 16:57:41 +0000
Subject: [PATCH 3/5] Bump version and changelog

---
 CHANGES.rst         | 21 +++++++++++++++++++++
 synapse/__init__.py |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 45d9cf30b..a85c8d69f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,24 @@
+Changes in synapse v0.14.0-rc2 (2016-03-23)
+===========================================
+
+Features:
+
+* Add published room list API (PR #657)
+
+Changes:
+
+* Change various caches to consume less memory (PR #656, #658, #660, #662,
+  #663, #665)
+* Allow rooms to be published without requiring an alias (PR #664)
+* Intern common strings in caches to reduce memory footprint (#666)
+
+Bug fixes:
+
+* Fix reject invites over federation (PR #646)
+* Fix bug where registration was not idempotent (PR #649)
+* Update aliases event after deleting aliases (PR #652)
+* Fix unread notification count, which was sometimes wrong (PR #661)
+
 Changes in synapse v0.14.0-rc1 (2016-03-14)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 67fbc3a33..60a7e8d69 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.14.0-rc1"
+__version__ = "0.14.0-rc2"

From 82312d4fff13714d00093c25f43ee5742d811fad Mon Sep 17 00:00:00 2001
From: Niklas Riekenbrauck <nikriek@gmail.com>
Date: Tue, 29 Mar 2016 23:36:00 +0200
Subject: [PATCH 4/5] Add new author

---
 AUTHORS.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 07d4bee2a..8711a6ae5 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -29,7 +29,7 @@ Matthew Hodgson <matthew at matrix.org>
 
 Emmanuel Rohee <manu at matrix.org>
  * Supporting iOS clients (testability and fallback registration)
-  
+
 Turned to Dust <dwinslow86 at gmail.com>
  * ArchLinux installation instructions
 
@@ -53,4 +53,7 @@ Mads Robin Christensen <mads at v42 dot dk>
  * CentOS 7 installation instructions.
 
 Florent Violleau <floviolleau at gmail dot com>
- * Add Raspberry Pi installation instructions and general troubleshooting items
\ No newline at end of file
+ * Add Raspberry Pi installation instructions and general troubleshooting items
+
+Niklas Riekenbrauck <nikriek at gmail dot.com>
+ * Add JWT support for registration and login

From e7aaa7c61eed963abf41950ed6c0fd4407dce49c Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Wed, 30 Mar 2016 12:35:25 +0100
Subject: [PATCH 5/5] Bump version and changelog

---
 CHANGES.rst         | 5 +++++
 synapse/__init__.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a85c8d69f..8c180750a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,8 @@
+Changes in synapse v0.14.0 (2016-03-30)
+=======================================
+
+No changes from v0.14.0-rc2
+
 Changes in synapse v0.14.0-rc2 (2016-03-23)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 60a7e8d69..7de51fbe8 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -16,4 +16,4 @@
 """ This is a reference implementation of a Matrix home server.
 """
 
-__version__ = "0.14.0-rc2"
+__version__ = "0.14.0"