Skip to content

Commit

Permalink
Merge pull request #246 from alkem-io/develop
Browse files Browse the repository at this point in the history
Release: Fixes
  • Loading branch information
valentinyanakiev authored Aug 4, 2023
2 parents 525e72f + e7058da commit e75abe8
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions service/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alkemio-notifications",
"version": "0.14.0",
"version": "0.14.1",
"description": "Alkemio notifications service",
"author": "Alkemio Foundation",
"private": false,
Expand Down
1 change: 1 addition & 0 deletions service/src/templates/_layouts/email-transactional.html
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@
alt="alkemio-logo"
/></a>
<br />
<br />
</td>
</tr>
<tr>
Expand Down
2 changes: 2 additions & 0 deletions service/src/templates/communication.user.message.recipient.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,10 @@ module.exports = () => ({
{{messageSender.displayName}} has sent you a message:
<br>
<br>
<i>{{message}}</i>
<br>
<br>
You can reply to this email to respond directly to {{messageSender.firstName}}.
Please keep in mind that this way, your email address will become visible.
If you prefer to communicate through Alkemio, click on the envelope icon on {{messageSender.displayName}}'s profile.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = () => ({
to: '{{recipient.email}}',
subject: 'Invitation to join {{journey.displayName}}',
html: `{% extends "src/templates/_layouts/email-transactional.html" %}
{% block content %}Hi {{inviter.name}},<br>
{% block content %}Hi {{inviter.name}},<br><br>
You have invited {{emails}} to join <a style="color:#065F6B; text-decoration: none;" href="{{journey.url}}">{{journey.displayName}}</a>.
{% if welcomeMessage %}
<br>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = () => ({
<br>
<i>{{welcomeMessage}}</i>
<br>
<a class="action-button" href="journey.url">click here to accept or decline</a><br><br>
<a class="action-button" href="{{journey.url}}">click here to accept or decline</a><br><br>
{% endblock %}
${templates.footerBlock}`,
},
Expand Down
6 changes: 3 additions & 3 deletions service/src/templates/community.user.application.admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ module.exports = () => ({
subject:
'{{journey.displayName}}: Application from {{applicant.firstName}}',
html: `{% extends "src/templates/_layouts/email-transactional.html" %}
{% block content %}Hi {{recipient.name}},<br><br>
{% block content %}Hi {{recipient.firstName}},<br><br>
We have received an application from <b>{{applicant.name}}</b> for the {{journey.type}} <a style="color:#065F6B; text-decoration: none;" href="{{journey.url}}">{{journey.displayName}}</a>, of which you are an admin.
<br>
<a class="action-button" href="{{member.profile}}">Have a look at {{applicant.firstName}}'s profile</a><br><br>
Review {{applicant.firstName}}'s application on the <a style="color:#065F6B;" href="{{journeyAdminURL}}" >Community tab on the settings page here</a>.
<a class="action-button" href="{{applicant.profile}}">Have a look at {{applicant.firstName}}'s profile</a><br><br>
Review {{applicant.firstName}}'s application on the Community tab on the settings page <a style="color:#065F6B;" href="{{journeyAdminURL}}" >here</a>.
<br><br>
{% endblock %}
${templates.footerBlock}`,
Expand Down

0 comments on commit e75abe8

Please sign in to comment.