DKIM and DISCLAIMER exclusion#49
Merged
stephdl merged 3 commits intoNethServer:masterfrom Jun 4, 2018
stephdl:dkimAndDisclaimerValidator
Merged
DKIM and DISCLAIMER exclusion#49stephdl merged 3 commits intoNethServer:masterfrom stephdl:dkimAndDisclaimerValidator
stephdl merged 3 commits intoNethServer:masterfrom
stephdl:dkimAndDisclaimerValidator
Conversation
Member
gsanchietti
reviewed
Jun 4, 2018
| $L['OpenDkimStatus_label'] = 'Sign outbound messages with DomainKeys Identified Mail (DKIM)'; | ||
| $L['DkimSelector_label'] = '1. Add a TXT record to your public DNS service provider with key "${0}"'; | ||
| $L['DkimKey_label'] = '2. Copy and paste the following text in the record data (RDATA) section'; | ||
| $L['Cannot_enable_dkim_and_disclaimer_both'] = 'The DISCLAIMER and the DKIM settings are not compatible'; |
Member
There was a problem hiding this comment.
I'd change to something like: The legal note and DKIM settings can't be both enabled at the same time.
Member
There was a problem hiding this comment.
I agree, it's better to reflect the same wording. In this context the "disclaimer" is labeled as "legal note".
Member
gsanchietti
approved these changes
Jun 4, 2018
[skip ci]
DavidePrincipi
approved these changes
Jun 4, 2018
DavidePrincipi
added a commit
to DavidePrincipi/nethserver-mail
that referenced
this pull request
Jun 12, 2018
This reverts commit c8dcecc.
DavidePrincipi
added a commit
to DavidePrincipi/nethserver-mail
that referenced
this pull request
Jun 12, 2018
This reverts commit c8dcecc.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
NethServer/dev#5514