Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #144 - Reworked Google channel #658

Merged
merged 2 commits into from
Sep 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions channels/email/accounts/account-setup.rst
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ The import process does things you might not expect:
Google is in the process of upgrading its security policies.
To stay up-to-date, do **not** add your account as an email
channel — instead, create a
:doc:`Google channel </channels/google/accounts/account-setup>`.
:doc:`Google channel </channels/google/basic-setup>`.

**Microsoft 365 users:**
Microsoft is in the process of upgrading its security policies.
Expand All @@ -38,7 +38,7 @@ Basic

In most cases, Zammad is smart enough to figure out your email provider's
configuration based on your email address alone. If the correct configuration
could not be retreived, Zammad asks you to provide the correct parameters
could not be retrieved, Zammad asks you to provide the correct parameters
manually.

.. figure:: /images/channels/email/account-basic-setup-inbound.png
Expand Down
2 changes: 1 addition & 1 deletion channels/email/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Control how Zammad **sends and receives email**.
🚛 Migrate existing email channel to "XOAUTH" channel
At this moment Zammad supports XOAUTH for the following providers:

* :doc:`Google </channels/google/accounts/migrate-from-email-channel>`
* :ref:`Google <migrate-channel>`
* :doc:`Microsoft 365 (formerly Office 365) </channels/microsoft365/accounts/migrate-from-email-channel>`

Use above links to use the migration option instead of removing and re-adding
Expand Down
73 changes: 0 additions & 73 deletions channels/google/accounts.rst

This file was deleted.

117 changes: 0 additions & 117 deletions channels/google/accounts/account-setup.rst

This file was deleted.

38 changes: 0 additions & 38 deletions channels/google/accounts/migrate-from-email-channel.rst

This file was deleted.

122 changes: 0 additions & 122 deletions channels/google/accounts/register-app.rst

This file was deleted.

Loading
Loading