Skip to content

Commit

Permalink
Fixes #144 - Reworked Google channel
Browse files Browse the repository at this point in the history
  • Loading branch information
ralf401 authored Sep 20, 2024
1 parent ee6bed4 commit 6fbba77
Show file tree
Hide file tree
Showing 32 changed files with 578 additions and 669 deletions.
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

0 comments on commit 6fbba77

Please sign in to comment.