Merge branch 'master' of github.com:matrix-org/synapse into develop
5 files changed, 30 insertions, 5 deletions
diff --git a/CHANGES.rst b/CHANGES.rst
index 400ded0f15..1690490f66 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,28 @@
+Changes in synapse 0.3.4 (2014-09-25)
+=====================================
+This version adds support for using a TURN server. See docs/turn-howto.rst on
+how to set one up.
+
+Homeserver:
+ * Add support for redaction of messages.
+ * Fix bug where inviting a user on a remote home server could take up to
+ 20-30s.
+ * Implement a get current room state API.
+ * Add support specifying and retrieving turn server configuration.
+
+Webclient:
+ * Add button to send messages to users from the home page.
+ * Add support for using TURN for VoIP calls.
+ * Show display name change messages.
+ * Fix bug where the client didn't get the state of a newly joined room
+ until after it has been refreshed.
+ * Fix bugs with tab complete.
+ * Fix bug where holding down the down arrow caused chrome to chew 100% CPU.
+ * Fix bug where desktop notifications occasionally used "Undefined" as the
+ display name.
+ * Fix more places where we sometimes saw room IDs incorrectly.
+ * Fix bug which caused lag when entering text in the text box.
+
Changes in synapse 0.3.3 (2014-09-22)
=====================================
diff --git a/VERSION b/VERSION
index 1c09c74e22..42045acae2 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.3.3
+0.3.4
diff --git a/docs/turn-howto.rst b/docs/turn-howto.rst
index 2cb0c4170d..82b59538c8 100644
--- a/docs/turn-howto.rst
+++ b/docs/turn-howto.rst
@@ -62,8 +62,8 @@ synapse Setup
Your home server configuration file needs the following extra keys:
- 1. "turn_uris": This needs to be a comma-separated
- list of public-facing URIs for your TURN server to be given out
+ 1. "turn_uris": This needs to be a yaml list
+ of public-facing URIs for your TURN server to be given out
to your clients. Add separate entries for each transport your
TURN server supports.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index bba551b2c4..a340a5db66 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.3.3"
+__version__ = "0.3.4"
diff --git a/synapse/config/voip.py b/synapse/config/voip.py
index c5131d9bcd..3a51664f46 100644
--- a/synapse/config/voip.py
+++ b/synapse/config/voip.py
@@ -19,7 +19,7 @@ class VoipConfig(Config):
def __init__(self, args):
super(VoipConfig, self).__init__(args)
- self.turn_uris = args.turn_uris.split(",") if args.turn_uris else None
+ self.turn_uris = args.turn_uris
self.turn_shared_secret = args.turn_shared_secret
self.turn_user_lifetime = args.turn_user_lifetime
|
