Uh oh!
There was an error while loading. Please reload this page.
Move encrypt-all password email to EmailTemplate - #36351
Merged
nickvergessen merged 2 commits intoApr 14, 2023
Merged
Conversation
nickvergessen
marked this pull request as draft
January 25, 2023 10:44
4 tasks
Merged
Merged
Merged
Signed-off-by: Joas Schilling <coding@schilljs.com>
nickvergessen
requested review from
a team, ArtificialOwl, Pytal, blizzz, icewind1991, skjnldsv and szaimen
and removed request for
a teamMarch 8, 2023 11:31
nickvergessen
marked this pull request as ready for review
March 8, 2023 11:40
nickvergessenforce-pushed
the
bugfix/noid/move-encryption-password-email-to-template
branch
from
March 8, 2023 11:40
4b0af81 to
0f7146cComparenickvergessen
commented
Mar 8, 2023
MemberAuthor
Either this PR needs to be backported or: diff --git a/apps/encryption/templates/mail.php b/apps/encryption/templates/mail.php
index 0db4b67d08d..545d080b1d3 100644
--- a/apps/encryption/templates/mail.php+++ b/apps/encryption/templates/mail.php@@ -7,7 +7,7 @@
<table cellspacing="0" cellpadding="0" border="0" width="600px">
<tr>
<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
- <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('core', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>+ <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('core', 'logo/logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
</td>
</tr>
<tr><td colspan="2"> </td></tr>To prevent the exception from the first "Before" screenshot. I would vote for backporting this PR here to 26 after 26.0.0 is out (string freeze) and backporting the above diff to all other versions. |
nickvergessen
commented
Mar 8, 2023
MemberAuthor
/backport to stable26 |
szaimen
removed their request for review
March 8, 2023 12:49
Signed-off-by: Joas Schilling <coding@schilljs.com>
marcoambrosini
approved these changes
Apr 14, 2023
nickvergessen
deleted the
bugfix/noid/move-encryption-password-email-to-template
branch
April 14, 2023 12:48
9 tasks
joshtrichards
commented
Aug 10, 2023
Member
Also fixes #35808 (but not for NC25 as-is until #36351 (comment) gets created in a separate PR). |
nickvergessen
commented
Aug 14, 2023
MemberAuthor
Feel free to send it as a Pull Request |
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 freeto 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.
Steps
occ app:enable encryptionocc encryption:disable-master-key(confirm with y)occ encryption:enableocc encryption:disable-master-key(confirm with y)occ encryption:encrypt-alli. Do you really want to continue? (confirm with y)
ii. Do you want to send the passwords directly to the users by mail? (confirm with y)
Checklist