From 63d1ed1d56431e00cce1ad02747eb56222e2c341 Mon Sep 17 00:00:00 2001 From: Slavi Pantaleev Date: Wed, 21 Aug 2019 07:24:58 +0300 Subject: [PATCH] Update changelog and documentation --- CHANGELOG.md | 9 +++++++++ docs/configuring-playbook-bridge-mautrix-hangouts.md | 6 +++--- docs/configuring-playbook.md | 2 ++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d73d19f64..85f4a4e76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 2019-08-21 + +## Google Hangouts support + +Thanks to the [great work](https://github.com/spantaleev/matrix-docker-ansible-deploy/pull/251) of [Eduardo Beltrame (Munfred)](https://github.com/Munfred) and [Robbie D (microchipster)](https://github.com/microchipster), the playbook now supports bridging to [Google Hangouts](https://hangouts.google.com/) via the [mautrix-hangouts](https://mau.dev/tulir/mautrix-hangouts) bridge. + +Additional details are available in [Setting up Mautrix Hangouts bridging](docs/configuring-playbook-bridge-mautrix-hangouts.md). + + # 2019-08-05 ## Email2Matrix support diff --git a/docs/configuring-playbook-bridge-mautrix-hangouts.md b/docs/configuring-playbook-bridge-mautrix-hangouts.md index 8e0720ab8..f7f892917 100644 --- a/docs/configuring-playbook-bridge-mautrix-hangouts.md +++ b/docs/configuring-playbook-bridge-mautrix-hangouts.md @@ -4,7 +4,7 @@ The playbook can install and configure [mautrix-hangouts](https://github.com/tul See the project's [documentation](https://github.com/tulir/mautrix-hangouts/wiki#usage) to learn what it does and why it might be useful to you. -To enable the Google Hangouts bridge just use the following playbook configuration: +To enable the [Google Hangouts](https://hangouts.google.com/) bridge just use the following playbook configuration: ```yaml @@ -19,6 +19,6 @@ Send `login` to the bridge bot to receive a link to the portal from which you ca Automatic login may not work. If it does not, reload the page and select the "Manual login" checkbox before starting. Manual login involves logging into your Google account normally and then manually getting the OAuth token from browser cookies with developer tools. -Once logged in recent chats should show up as new conversations automatically. Other chats will get portals as you receive messages +Once logged in, recent chats should show up as new conversations automatically. Other chats will get portals as you receive messages. -You can learn more here about authentication from the bridge's [official documentation on Authentication](https://github.com/tulir/mautrix-hangouts/wiki/Authentication). +You can learn more about authentication from the bridge's [official documentation on Authentication](https://github.com/tulir/mautrix-hangouts/wiki/Authentication). diff --git a/docs/configuring-playbook.md b/docs/configuring-playbook.md index e9575c626..ec81e630a 100644 --- a/docs/configuring-playbook.md +++ b/docs/configuring-playbook.md @@ -79,6 +79,8 @@ When you're done with all the configuration you'd like to do, continue with [Ins - [Setting up Mautrix Facebook bridging](configuring-playbook-bridge-mautrix-facebook.md) (optional) +- [Setting up Mautrix Hangouts bridging](configuring-playbook-bridge-mautrix-hangouts.md) (optional) + - [Setting up Appservice IRC bridging](configuring-playbook-bridge-appservice-irc.md) (optional) - [Setting up Appservice Discord bridging](configuring-playbook-bridge-appservice-discord.md) (optional)