From 9f497e82c20c044fdaa749f92b2b92ad2ba8aad4 Mon Sep 17 00:00:00 2001 From: Milan Vit Date: Fri, 8 May 2020 15:38:14 +0900 Subject: [PATCH 1/3] Fix pathes -> paths typo in two places (#3524) --- data/web/lang/lang.en.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/web/lang/lang.en.json b/data/web/lang/lang.en.json index 7399f8e5..1a67740d 100644 --- a/data/web/lang/lang.en.json +++ b/data/web/lang/lang.en.json @@ -204,7 +204,7 @@ "no_record": "No record", "oauth2_client_id": "Client ID", "oauth2_client_secret": "Client secret", - "oauth2_info": "The OAuth2 implementation supports the grant type \"Authorization Code\" and issues refresh tokens.
\r\nThe server also automatically issues new refresh tokens, after a refresh token has been used.

\r\n→ The default scope is profile. Only mailbox users can be authenticated against OAuth2. If the scope parameter is omitted, it falls back to profile.
\r\n→ The state parameter is required to be sent by the client as part of the authorize request.

\r\nPathes for requests to the OAuth2 API:
\r\n\r\nRegenerating the client secret will not expire existing authorization codes, but they will fail to renew their token.

\r\nRevoking client tokens will cause immediate termination of all active sessions. All clients need to re-authenticate.", + "oauth2_info": "The OAuth2 implementation supports the grant type \"Authorization Code\" and issues refresh tokens.
\r\nThe server also automatically issues new refresh tokens, after a refresh token has been used.

\r\n→ The default scope is profile. Only mailbox users can be authenticated against OAuth2. If the scope parameter is omitted, it falls back to profile.
\r\n→ The state parameter is required to be sent by the client as part of the authorize request.

\r\nPaths for requests to the OAuth2 API:
\r\n\r\nRegenerating the client secret will not expire existing authorization codes, but they will fail to renew their token.

\r\nRevoking client tokens will cause immediate termination of all active sessions. All clients need to re-authenticate.", "oauth2_redirect_uri": "Redirect URI", "oauth2_renew_secret": "Generate new client secret", "oauth2_revoke_tokens": "Revoke all client tokens", @@ -877,7 +877,7 @@ "app_name": "App name", "app_passwds": "App passwords", "apple_connection_profile": "Apple connection profile", - "apple_connection_profile_complete": "This connection profile includes IMAP and SMTP parameters as well as CalDAV (calendars) and CardDAV (contacts) pathes for an Apple device.", + "apple_connection_profile_complete": "This connection profile includes IMAP and SMTP parameters as well as CalDAV (calendars) and CardDAV (contacts) paths for an Apple device.", "apple_connection_profile_mailonly": "This connection profile includes IMAP and SMTP configuration parameters for an Apple device.", "change_password": "Change password", "client_configuration": "Show configuration guides for email clients and smartphones", @@ -995,4 +995,4 @@ "session_token": "Form token invalid: Token mismatch", "session_ua": "Form token invalid: User-Agent validation error" } -} \ No newline at end of file +} From 099be319282a3035070395a093a8144ed4f275bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Matula?= Date: Fri, 8 May 2020 18:29:51 +0200 Subject: [PATCH 2/3] [Dovecot] Quarantine template: css for mobile devices (#3520) --- data/assets/templates/quarantine.tpl | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/data/assets/templates/quarantine.tpl b/data/assets/templates/quarantine.tpl index a0479a4a..e01d4cdb 100644 --- a/data/assets/templates/quarantine.tpl +++ b/data/assets/templates/quarantine.tpl @@ -1,5 +1,6 @@ + @@ -31,15 +42,15 @@ There are {{counter}} new messages waiting in quarantine:
{% endif %} - {% if quarantine_acl == 1 %}{% endif %} + {% if quarantine_acl == 1 %}{% endif %} {% for line in meta %} - - + + {% if quarantine_acl == 1 %} - + {% endif %} {% endfor %} From fe05e245792d1d36b2d4e501c7c87f2283520773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Matula?= Date: Fri, 8 May 2020 18:39:03 +0200 Subject: [PATCH 3/3] [Dovecot] Quota template - colored bar based on % (#3525) * [Dovecot] Quarantine template: css for mobile devices * [Dovecot] Colored quota bar based on % formatting html --- data/assets/templates/quota.tpl | 78 +++++++++++++++++++++------------ 1 file changed, 51 insertions(+), 27 deletions(-) diff --git a/data/assets/templates/quota.tpl b/data/assets/templates/quota.tpl index eef5c92a..24555478 100644 --- a/data/assets/templates/quota.tpl +++ b/data/assets/templates/quota.tpl @@ -1,29 +1,53 @@ - - - - -

Hi {{username}}!

- Your mailbox is now {{percent}}% full, please consider deleting old messages to still be able to receive new mails in the future.
-

-
-
-

- + + + + +
+

Hi {{username}}!

+ Your mailbox is now {{percent}}% full, please consider deleting old messages to still be able to receive new mails in the future.
+

+
{{percent}}%
+
+

+
+
SubjectSenderScoreArrived onActions
SubjectSenderScoreArrived onActions
{{ line.subject|e }} {{ line.sender|e }}{{ line.score }}{{ line.created }}{{ line.score }}{{ line.created }}release | deleterelease | delete