[PR #1670] [MERGED] Updated branding, email and crates #2992

New issue

Closed

opened 2026-03-03 09:09:16 +03:00 by kerem · 0 comments

kerem commented

2026-03-03 09:09:16 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/dani-garcia/vaultwarden/pull/1670
Author: @BlackDex
Created: 5/5/2021
Status: ✅ Merged
Merged: 5/8/2021
Merged by: @dani-garcia

Base: main ← Head: branding-and-email

📝 Commits (1)

7cb19ef Updated branding, email and crates

📊 Changes

40 files changed (+482 additions, -1863 deletions)

View changed files

📝 Cargo.lock (+78 -91)
📝 Cargo.toml (+5 -6)
📝 src/api/icons.rs (+2 -2)
📝 src/api/web.rs (+3 -1)
📝 src/config.rs (+4 -0)
📝 src/error.rs (+0 -2)
📝 src/mail.rs (+4 -5)
📝 src/static/images/hibp.png (+0 -0)
📝 src/static/images/logo-gray.png (+0 -0)
➖ src/static/images/shield-white.png (+0 -0)
➕ src/static/images/vaultwarden-icon.png (+0 -0)
📝 src/static/templates/admin/base.hbs (+5 -4)
📝 src/static/templates/email/change_email.html.hbs (+14 -127)
📝 src/static/templates/email/delete_account.hbs (+1 -3)
📝 src/static/templates/email/delete_account.html.hbs (+22 -135)
➕ src/static/templates/email/email_footer.hbs (+25 -0)
➕ src/static/templates/email/email_footer_text.hbs (+3 -0)
➕ src/static/templates/email/email_header.hbs (+94 -0)
📝 src/static/templates/email/invite_accepted.hbs (+1 -3)
📝 src/static/templates/email/invite_accepted.html.hbs (+19 -132)

...and 20 more files

📄 Description

Updated branding for admin and emails
Updated crates and some deprecations
Removed newline-converter because this is built-in into lettre
Updated email templates to use a shared header and footer template
Also trigger SMTP SSL When TLS is selected without SSL
Resolves #1641

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/dani-garcia/vaultwarden/pull/1670 **Author:** [@BlackDex](https://github.com/BlackDex) **Created:** 5/5/2021 **Status:** ✅ Merged **Merged:** 5/8/2021 **Merged by:** [@dani-garcia](https://github.com/dani-garcia) **Base:** `main` ← **Head:** `branding-and-email` --- ### 📝 Commits (1) - [`7cb19ef`](https://github.com/dani-garcia/vaultwarden/commit/7cb19ef767142b773ab44a457940844589432a74) Updated branding, email and crates ### 📊 Changes **40 files changed** (+482 additions, -1863 deletions) <details> <summary>View changed files</summary> 📝 `Cargo.lock` (+78 -91) 📝 `Cargo.toml` (+5 -6) 📝 `src/api/icons.rs` (+2 -2) 📝 `src/api/web.rs` (+3 -1) 📝 `src/config.rs` (+4 -0) 📝 `src/error.rs` (+0 -2) 📝 `src/mail.rs` (+4 -5) 📝 `src/static/images/hibp.png` (+0 -0) 📝 `src/static/images/logo-gray.png` (+0 -0) ➖ `src/static/images/shield-white.png` (+0 -0) ➕ `src/static/images/vaultwarden-icon.png` (+0 -0) 📝 `src/static/templates/admin/base.hbs` (+5 -4) 📝 `src/static/templates/email/change_email.html.hbs` (+14 -127) 📝 `src/static/templates/email/delete_account.hbs` (+1 -3) 📝 `src/static/templates/email/delete_account.html.hbs` (+22 -135) ➕ `src/static/templates/email/email_footer.hbs` (+25 -0) ➕ `src/static/templates/email/email_footer_text.hbs` (+3 -0) ➕ `src/static/templates/email/email_header.hbs` (+94 -0) 📝 `src/static/templates/email/invite_accepted.hbs` (+1 -3) 📝 `src/static/templates/email/invite_accepted.html.hbs` (+19 -132) _...and 20 more files_ </details> ### 📄 Description - Updated branding for admin and emails - Updated crates and some deprecations - Removed newline-converter because this is built-in into lettre - Updated email templates to use a shared header and footer template - Also trigger SMTP SSL When TLS is selected without SSL Resolves #1641 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>