nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Link to the pod in the emails footer

Browse source 
closes #7814
This commit is contained in:
flaburgan 2018-05-08 20:25:13 +02:00 committed by Benjamin Neff
parent 10841b6031
commit 3d83fbdbe5
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -4,6 +4,7 @@
* Add unique index to poll participations on `poll_id` and `author_id` [#7798](https://github.com/diaspora/diaspora/pull/7798) * Add unique index to poll participations on `poll_id` and `author_id` [#7798](https://github.com/diaspora/diaspora/pull/7798)
* Add 'completed at' date to account migrations [#7805](https://github.com/diaspora/diaspora/pull/7805) * Add 'completed at' date to account migrations [#7805](https://github.com/diaspora/diaspora/pull/7805)
* Handle duplicates for TagFollowing on account merging [#7807](https://github.com/diaspora/diaspora/pull/7807) * Handle duplicates for TagFollowing on account merging [#7807](https://github.com/diaspora/diaspora/pull/7807)
* Add link to the pod in the email footer [#7814](https://github.com/diaspora/diaspora/pull/7814)
## Bug fixes ## Bug fixes
* Fix compatibility with newer glibc versions [#7828](https://github.com/diaspora/diaspora/pull/7828) * Fix compatibility with newer glibc versions [#7828](https://github.com/diaspora/diaspora/pull/7828)

2
app/views/layouts/notifier.html.haml
View file

@ -10,6 +10,6 @@
!= yield != yield
%div{style: "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; color: #999; padding-top: 10px; margin-top: 10px; border-top: 1px solid #ddd"} %div{style: "font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; font-size: 12px; color: #999; padding-top: 10px; margin-top: 10px; border-top: 1px solid #ddd"}
!= t("notifier.email_sent_by_diaspora", pod_name: pod_name) != t("notifier.email_sent_by_diaspora", pod_name: link_to(pod_name, AppConfig.pod_uri.site))
!= link_to t("notifier.click_here"), edit_user_url != link_to t("notifier.click_here"), edit_user_url
!= t("notifier.to_change_your_notification_settings") + "." != t("notifier.to_change_your_notification_settings") + "."

4
app/views/layouts/notifier.text.haml
View file

@ -1,4 +1,4 @@
!= yield != yield
!= t('notifier.email_sent_by_diaspora', :pod_name => pod_name) != t("notifier.email_sent_by_diaspora", pod_name: pod_name)
!= t('notifier.to_change_your_notification_settings') != t("notifier.to_change_your_notification_settings")
!= edit_user_url != edit_user_url