summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-11 18:35:16 +0000
committerErik Johnston <erik@matrix.org>2015-11-11 18:35:16 +0000
commit884e601683adf11d8ff8b0fb6bb34188524bf5c5 (patch)
tree150e39eaed6280868736efb50f036f72e8033570
parentMerge pull request #361 from matrix-org/daniel/guestcontext (diff)
parentUpdate date (diff)
downloadsynapse-884e601683adf11d8ff8b0fb6bb34188524bf5c5.tar.xz
Merge branch 'release-v0.11.0' of github.com:matrix-org/synapse into develop
-rw-r--r--CHANGES.rst16
-rw-r--r--synapse/__init__.py2
2 files changed, 17 insertions, 1 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index da118b7ceb..cf5e33c4f9 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,19 @@
+Changes in synapse v0.11.0-rc1 (2015-11-11)
+===========================================
+
+* Add Search API (PR #307, #324, #327, #336, #350, #359)
+* Add 'archived' state to v2 /sync API (PR #316)
+* Add ability to reject invites (PR #317)
+* Add config option to disable password login (PR #322)
+* Add the login fallback API (PR #330)
+* Add room context API (PR #334)
+* Add room tagging support (PR #335)
+* Update v2 /sync API to match spec (PR #305, #316, #321, #332, #337, #341)
+* Change retry schedule for application services (PR #320)
+* Change retry schedule for remote servers (PR #340)
+* Fix bug where we hosted static content in the incorrect place (PR #329)
+* Fix bug where we didn't increment retry interval for remote servers (PR #343)
+
 Changes in synapse v0.10.1-rc1 (2015-10-15)
 ===========================================
 
diff --git a/synapse/__init__.py b/synapse/__init__.py
index e9ce0412ed..f68a15bb85 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.10.1-rc1"
+__version__ = "0.11.0-rc1"