commit d4ef648fa3a2fb05b32b133d2c132ef9f5dbbb13
Author: Wim <wim@42.be>
Date: Tue Jun 19 00:28:16 2018 +0000
Release v1.11.0
diff --git a/README.md b/README.md
index 96531be..38b9861 100644
--- a/README.md
+++ b/README.md
@@ -497 +497 @@ Used by at least 2 projects. Feel free to make a PR to add your project to this
# Requirements
Accounts to one of the supported bridges
-* [Mattermost](https://github.com/mattermost/platform/) 3.8.x - 3.10.x, 4.x
+* [Mattermost](https://github.com/mattermost/platform/) 3.8.x - 3.10.x, 4.x, 5.x
* [IRC](http://www.mirc.com/servers.html)
* [XMPP](https://jabber.org)
* [Gitter](https://gitter.im)
@@ -697 +697 @@ See https://github.com/42wim/matterbridge/wiki
# Installing
## Binaries
-* Latest stable release [v1.10.1](https://github.com/42wim/matterbridge/releases/latest)
+* Latest stable release [v1.11.0](https://github.com/42wim/matterbridge/releases/latest)
* Development releases (follows master) can be downloaded [here](https://dl.bintray.com/42wim/nightly/)
## Building
diff --git a/changelog.md b/changelog.md
index ae10d72..f6180ef 100644
--- a/changelog.md
+++ b/changelog.md
@@ -13 +122 @@
+# v1.11.0
+
+## New features
+* general: Add config option MediaDownloadPath (#443). See `MediaDownloadPath` in matterbridge.toml.sample
+* general: Add MediaDownloadBlacklist option. Closes #442. See `MediaDownloadBlacklist` in matterbridge.toml.sample
+* xmpp: Add channel password support for XMPP (#451)
+* xmpp: Add message correction support for XMPP (#437)
+* telegram: Add support for MessageFormat=htmlnick (telegram). #444
+* mattermost: Add support for mattermost 5.x
+
+## Enhancements
+* slack: Add Title from attachment slack message (#446)
+* irc: Prevent white or black color codes (irc) (#434)
+
+## Bugfix
+* slack: Fix regexp in replaceMention (slack). (#435)
+* irc: Reconnect on quit. (irc) See #431 (#445)
+* sshchat: Ignore messages from ourself. (sshchat) Closes #439
+
# v1.10.1
## New features
* irc: Colorize username sent to IRC using its crc32 IEEE checksum (#423). See `ColorNicks` in matterbridge.toml.sample
diff --git a/matterbridge.go b/matterbridge.go
index df13802..7c02491 100644
--- a/matterbridge.go
+++ b/matterbridge.go
@@ -147 +147 @@ import (
)
var (
- version = "1.10.2-dev"
+ version = "1.11.0"
githash string
)
diff --git a/matterbridge.toml.sample b/matterbridge.toml.sample
index 1f942e5..5844561 100644
--- a/matterbridge.toml.sample
+++ b/matterbridge.toml.sample
@@ -7999 +79910 @@ Token="Yourtokenhere"
## Settings below can be reloaded by editing the file
#OPTIONAL (default empty)
-#Supported formats are "HTML" and "Markdown"
+#Supported formats are "HTML", "Markdown" and "HTMLNick"
#See https://core.telegram.org/bots/api#html-style
#See https://core.telegram.org/bots/api#markdown-style
+#HTMLNick only allows HTML for the nick, the message itself will be html-escaped
MessageFormat=""
#If enabled use the "First Name" as username. If this is empty use the Username
