Skip to content

Commit

Permalink
Update changelog and documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
spantaleev committed Aug 21, 2019
1 parent c8a4d59 commit 63d1ed1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions docs/configuring-playbook-bridge-mautrix-hangouts.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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).
2 changes: 2 additions & 0 deletions docs/configuring-playbook.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 63d1ed1

Please sign in to comment.