Merge master(fixes) to 2.x #1192
Merged
Conversation
This file contains 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
…aps disclose sensitive data)
…llowing the display of external resources from a particular sender
…nup and custom_imap_sources conversion - makes upgrades from 1.x to 2.x seamless regarding sources in combined inbox
…et cannot be unset
…to-2-2-0 Update Cypht Docker version
[FIX] ensure the email address part is the only value captured when allowing the display of external resources from a particular sender
Autocrypt messages encrept automatically
…rrect-in-tiki-cypht Define constant for theme path
…rocessing more rules'
…ey-rmk [FIX]Profiles: Fixing undefined array key rmk on Profiles page
…you-are-about-to-reply-to-a-new-contact-and-perhaps-disclose-sensitive-data [EHN]Like Gmail, warn if you are about to reply to a new contact (and perh…
…ges-once-set-cannot-be-unset [FIX]Site Settings/General/:Warn for Unsaved Changes parameter once set cannot be unset
|
@kroky I was wondering if I should cherry-pick one by one. |
|
Merge is fine here! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
According to #1182 (comment) all fixes should be cherry-picked to 2.x and at the moment all commits missing are fixes. I then merged all to 2.x