Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Mastodon link to server email templates #23309

Merged
merged 8 commits into from
Dec 16, 2024
Merged

Add Mastodon link to server email templates #23309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0433ec7
Added Mastodon icon to email templates
jc0b Oct 28, 2024
92298ed
Correct Mastodon image width
jc0b Oct 28, 2024
00681e3
Merge branch 'main' into main
jc0b Nov 25, 2024
b8aeb6f
Switched Mastodon icon to PNG
jc0b Dec 7, 2024
616e6d0
Merge branch 'main' of github.com:jc0b/fleet
jc0b Dec 7, 2024
0b60729
Merge branch 'fleetdm:main' into main
jc0b Dec 16, 2024
1866473
Put Mastodon logo in the right place
jc0b Dec 16, 2024
f78c723
Added changes file
jc0b Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changes/23309-mastodon-in-email-templates
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* Added Mastodon icon and URL to server email templates.
7 changes: 7 additions & 0 deletions server/mail/templates/change_email_confirmation.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ <h1>Confirm your updated email address</h1>
src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
/>
</a>
<a href="https://discuss.systems/@Fleet" target="_blank">
<img
alt="Mastodon logo"
style="height: 20px; width: 20px; padding-right: 20px"
src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
/>
</a>
<a href="https://twitter.com/fleetctl" target="_blank">
<img
alt="X logo"
Expand Down
7 changes: 7 additions & 0 deletions server/mail/templates/invite_token.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ <h1>You have been invited to Fleet!</h1>
src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
/>
</a>
<a href="https://discuss.systems/@Fleet" target="_blank">
<img
alt="Mastodon logo"
style="height: 20px; width: 20px; padding-right: 20px"
src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
/>
</a>
<a href="https://twitter.com/fleetctl" target="_blank">
<img
alt="X logo"
Expand Down
7 changes: 7 additions & 0 deletions server/mail/templates/mfa.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,13 @@ <h1>Log in to Fleet</h1>
src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
/>
</a>
<a href="https://discuss.systems/@Fleet" target="_blank">
<img
alt="Mastodon logo"
style="height: 20px; width: 20px; padding-right: 20px"
src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
/>
</a>
<a href="https://twitter.com/fleetctl" target="_blank">
<img
alt="X logo"
Expand Down
7 changes: 7 additions & 0 deletions server/mail/templates/password_reset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,13 @@ <h1>Reset your Fleet password</h1>
src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
/>
</a>
<a href="https://discuss.systems/@Fleet" target="_blank">
<img
alt="Mastodon logo"
style="height: 20px; width: 20px; padding-right: 20px"
src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
/>
</a>
<a href="https://twitter.com/fleetctl" target="_blank">
<img
alt="X logo"
Expand Down
7 changes: 7 additions & 0 deletions server/mail/templates/smtp_setup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,13 @@ <h1>Fleet SMTP setup confirmed</h1>
src="{{.AssetURL}}/fleet-mark-color-40x40@2x.png"
/>
</a>
<a href="https://discuss.systems/@Fleet" target="_blank">
<img
alt="Mastodon logo"
style="height: 20px; width: 20px; padding-right: 20px"
src="{{.AssetURL}}/mastodon-logo-50x40@2x.png"
/>
</a>
<a href="https://twitter.com/fleetctl" target="_blank">
<img
alt="X logo"
Expand Down
Binary file added website/assets/images/permanent/mastodon-logo-50x40@2x.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading