Skip to content

Commit

Permalink
Merge pull request #78 from alkem-io/develop
Browse files Browse the repository at this point in the history
Release: Fixed an issue of replicated footer string
  • Loading branch information
valentinyanakiev authored Dec 17, 2021
2 parents b88b788 + 4903936 commit 9087c83
Show file tree
Hide file tree
Showing 12 changed files with 5 additions and 14 deletions.
4 changes: 2 additions & 2 deletions 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 package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "alkemio-notifications",
"version": "0.4.4",
"version": "0.4.5",
"description": "Alkemio notifications service",
"author": "Cherrytwist Foundation",
"private": false,
Expand Down
3 changes: 1 addition & 2 deletions src/app.controller.ts
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ export class AppController {
this.logger.verbose?.('All messages failed to be sent!');
// if all messages failed to be sent, we reject the message but we make sure the message is
// not discarded so we provide 'true' to requeue parameter
channel.nack(originalMsg, false, false);
// channel.reject(originalMsg, true);
channel.reject(originalMsg, true);
} else {
this.logger.verbose?.(
`${nacked.length} messages out of total ${x.length} messages failed to be sent!`
Expand Down
2 changes: 1 addition & 1 deletion src/templates/_layouts/email-transactional.html
Original file line number Diff line number Diff line change
Expand Up @@ -356,4 +356,4 @@
<![endif]-->
</div>
</body>
</html>
</html>
1 change: 0 additions & 1 deletion src/templates/communication.discussion.created.admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module.exports = () => ({
A new discussion was created by {{createdBy.firstname}} on <a href="{{community.url}}">{{community.name}}</a>: {{discussion.title}}<br><br>
Sincerely yours,
Team Alkemio
{% endblock %}
${templates.footerBlock}`,
},
Expand Down
1 change: 0 additions & 1 deletion src/templates/communication.discussion.created.member.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module.exports = () => ({
A new discussion was created by {{createdBy.firstname}} on your community <a href="{{community.url}}">{{community.name}}</a>: {{discussion.title}}<br><br>
Sincerely yours,
Team Alkemio
{% endblock %}
${templates.footerBlock}`,
},
Expand Down
1 change: 0 additions & 1 deletion src/templates/communication.update.admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module.exports = () => ({
A new update was shared by {{sender.firstname}} on the following community: <a href="{{community.url}}">{{community.name}}</a>.<br><br>
Sincerely yours,
Team Alkemio
{% endblock %}
${templates.footerBlock}`,
Expand Down
1 change: 0 additions & 1 deletion src/templates/communication.update.member.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module.exports = () => ({
To view the update please navigate to <a href="{{community.url}}">{{community.name}}</a>.<br><br>
Sincerely yours,
Team Alkemio
{% endblock %}
${templates.footerBlock}`,
Expand Down
1 change: 0 additions & 1 deletion src/templates/user.application.admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ module.exports = () => ({
The profile of the new applicant is available <a href="{{applicant.profile}}" >here</a>.<br><br>
Sincerely yours,
Team Alkemio
{% endblock %}
${templates.footerBlock}`,
},
Expand Down
1 change: 0 additions & 1 deletion src/templates/user.application.applicant.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ module.exports = () => ({
We have received your application for <a href="{{community.url}}">{{community.name}}</a> [{{community.type}}]!<br><br>
Please view the status of your application on your <a href="{{applicant.profile}}">profile</a>.<br><br>
Sincerely yours,
Team Alkemio
{% endblock %}
${templates.footerBlock}`,
},
Expand Down
1 change: 0 additions & 1 deletion src/templates/user.registration.admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ module.exports = () => ({
There is a <a href="{{registrant.profile}}" >new user registration </a>: {{registrant.name}}, with email {{registrant.email}}<br><br>
Sincerely yours,
Team Alkemio
{% endblock %}
${templates.footerBlock}`,
},
Expand Down
1 change: 0 additions & 1 deletion src/templates/user.registration.registrant.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ module.exports = () => ({
Looking forward to seeing your interactions and contributions!
Sincerely yours,
Team Alkemio
{% endblock %}
${templates.footerBlock}`,
},
Expand Down

0 comments on commit 9087c83

Please sign in to comment.