Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into HIN-1132 (4143faad) · Commits · xpub / xpub-faraday

Commit 4143faad authored 6 years ago by

Tania Fecheta

Browse files

Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into HIN-1132

parents 7291f992 fd54980c

No related branches found

No related tags found

3 merge requests!160Update staging with master features,!156Develop,!154Hin 1132

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-email-templating/README.md 10 additions, 7 deletions

packages/component-email-templating/README.md
packages/component-email-templating/src/EmailTemplate.js 35 additions, 14 deletions

packages/component-email-templating/src/EmailTemplate.js
packages/component-email-templating/src/HTMLTemplateService.js 1 addition, 8 deletions

...ges/component-email-templating/src/HTMLTemplateService.js
packages/component-email-templating/tests/HTMLTemplateService.test.js 5 additions, 5 deletions

...ponent-email-templating/tests/HTMLTemplateService.test.js
packages/component-email/src/routes/emails/emailCopy.js 1 addition, 3 deletions

packages/component-email/src/routes/emails/emailCopy.js
packages/component-email/src/routes/emails/helpers.js 0 additions, 39 deletions

packages/component-email/src/routes/emails/helpers.js
packages/component-email/src/routes/emails/notifications.js 49 additions, 9 deletions

packages/component-email/src/routes/emails/notifications.js
packages/component-email/src/routes/emails/post.js 36 additions, 40 deletions

packages/component-email/src/routes/emails/post.js
packages/component-faraday-ui/src/AuthorReply.js 38 additions, 12 deletions

packages/component-faraday-ui/src/AuthorReply.js
packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js 20 additions, 3 deletions

...raday-ui/src/contextualBoxes/ResponseToRevisionRequest.js
packages/component-invite/src/routes/collectionsInvitations/delete.js 1 addition, 2 deletions

...ponent-invite/src/routes/collectionsInvitations/delete.js
packages/component-invite/src/routes/collectionsInvitations/emails/helpers.js 0 additions, 78 deletions

...nvite/src/routes/collectionsInvitations/emails/helpers.js
packages/component-invite/src/routes/collectionsInvitations/emails/notifications.js 82 additions, 27 deletions

...src/routes/collectionsInvitations/emails/notifications.js
packages/component-invite/src/routes/collectionsInvitations/patch.js 2 additions, 3 deletions

...mponent-invite/src/routes/collectionsInvitations/patch.js
packages/component-invite/src/routes/collectionsInvitations/post.js 3 additions, 5 deletions

...omponent-invite/src/routes/collectionsInvitations/post.js
packages/component-invite/src/routes/fragmentsInvitations/decline.js 1 addition, 1 deletion

...mponent-invite/src/routes/fragmentsInvitations/decline.js
packages/component-invite/src/routes/fragmentsInvitations/delete.js 1 addition, 2 deletions

...omponent-invite/src/routes/fragmentsInvitations/delete.js
packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js 39 additions, 54 deletions

...ite/src/routes/fragmentsInvitations/emails/invitations.js
packages/component-invite/src/routes/fragmentsInvitations/emails/notifications.js 87 additions, 101 deletions

...e/src/routes/fragmentsInvitations/emails/notifications.js
packages/component-invite/src/routes/fragmentsInvitations/patch.js 12 additions, 1 deletion

...component-invite/src/routes/fragmentsInvitations/patch.js

with 423 additions and 414 deletions

Please register or to comment