Compare commits

...

3 Commits

Author SHA1 Message Date
Wim
858e16d34f Release v1.14.1 2019-03-21 21:07:11 +01:00
Wim
a60e62efb1 Update doc wrt rocketchat api issue 2019-03-21 21:05:27 +01:00
David Hill
97f9d4be67 Fix double unlock (slack) (#771) 2019-03-21 17:30:28 +01:00
5 changed files with 8 additions and 3 deletions

View File

@@ -123,7 +123,7 @@ See https://github.com/42wim/matterbridge/wiki
## Installing ## Installing
### Binaries ### Binaries
* Latest stable release [v1.14.0](https://github.com/42wim/matterbridge/releases/latest) * Latest stable release [v1.14.1](https://github.com/42wim/matterbridge/releases/latest)
* Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/) * Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)
### Packages ### Packages

View File

@@ -87,7 +87,6 @@ func (b *users) populateUser(userID string) {
// in case the previous query failed for some reason. // in case the previous query failed for some reason.
} else { } else {
b.usersSyncPoints[userID] = make(chan struct{}) b.usersSyncPoints[userID] = make(chan struct{})
b.usersMutex.Unlock()
break break
} }
} }

View File

@@ -1,3 +1,7 @@
# v1.14.1
## Bugfix
* slack: Fix crash double unlock (slack) (#771)
# v1.14.0 # v1.14.0
## Breaking ## Breaking

View File

@@ -15,7 +15,7 @@ import (
) )
var ( var (
version = "1.14.0" version = "1.14.1"
githash string githash string
flagConfig = flag.String("conf", "matterbridge.toml", "config file") flagConfig = flag.String("conf", "matterbridge.toml", "config file")

View File

@@ -1051,6 +1051,8 @@ SkipTLSVerify=true
#Useful if username overrides for incoming webhooks isn't enabled on the #Useful if username overrides for incoming webhooks isn't enabled on the
#rocketchat server. If you set PrefixMessagesWithNick to true, each message #rocketchat server. If you set PrefixMessagesWithNick to true, each message
#from bridge to rocketchat will by default be prefixed by the RemoteNickFormat setting. i #from bridge to rocketchat will by default be prefixed by the RemoteNickFormat setting. i
#if you're using login/pass you can better enable because of this bug:
#https://github.com/RocketChat/Rocket.Chat/issues/7549
#OPTIONAL (default false) #OPTIONAL (default false)
PrefixMessagesWithNick=false PrefixMessagesWithNick=false