diff options
| author | Erik Johnston <erik@matrix.org> | 2014-09-18 16:22:14 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-09-18 16:22:14 +0100 |
| commit | e0f060d89b9ed82284e3781640fb77257d116753 (patch) | |
| tree | 93010a33c66d1213c1a6285919cb9eca3f81a8e0 | |
| parent | fix wordwrap (diff) | |
| parent | Bump Changelog and version (diff) | |
| download | synapse-e0f060d89b9ed82284e3781640fb77257d116753.tar.xz | |
Merge branch 'master' of github.com:matrix-org/synapse into develop
| -rw-r--r-- | CHANGES.rst | 7 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | synapse/__init__.py | 2 | ||||
| -rw-r--r-- | webclient/components/matrix/event-handler-service.js | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/CHANGES.rst b/CHANGES.rst index edf32db752..9e884e51bf 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -1,3 +1,10 @@ +Changes in synapse 0.3.2 (2014-09-18) +===================================== + +Webclient: + * Fix bug where an empty "bing words" list in old accounts didn't send + notifications when it should have done. + Changes in synapse 0.3.1 (2014-09-18) ===================================== This is a release to hotfix v0.3.0 to fix two regressions. diff --git a/VERSION b/VERSION index 9e11b32fca..d15723fbe8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.3.1 +0.3.2 diff --git a/synapse/__init__.py b/synapse/__init__.py index 1b49cbb38e..0dbad9a0de 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.1" +__version__ = "0.3.2" diff --git a/webclient/components/matrix/event-handler-service.js b/webclient/components/matrix/event-handler-service.js index 321054f904..c7be65720a 100644 --- a/webclient/components/matrix/event-handler-service.js +++ b/webclient/components/matrix/event-handler-service.js @@ -189,7 +189,7 @@ function(matrixService, $rootScope, $q, $timeout, mPresence) { // always bing if there are 0 bing words... apparently. var bingWords = matrixService.config().bingWords; - if (bingWords && bingWords.length === 0) { + if (bingWords === undefined || bingWords.length === 0) { shouldBing = true; } |