Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into HIN-1089
# Conflicts: # packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js
Showing
- packages/component-email-templating/src/templates/partials/footer.hbs 2 additions, 1 deletion...ponent-email-templating/src/templates/partials/footer.hbs
- packages/component-email-templating/src/templates/partials/invButtons.hbs 36 additions, 22 deletions...nt-email-templating/src/templates/partials/invButtons.hbs
- packages/component-email-templating/src/templates/partials/invHeader.hbs 28 additions, 19 deletions...ent-email-templating/src/templates/partials/invHeader.hbs
- packages/component-email-templating/src/templates/partials/invLowerContent.hbs 15 additions, 11 deletions...ail-templating/src/templates/partials/invLowerContent.hbs
- packages/component-email-templating/src/templates/partials/invManuscriptData.hbs 62 additions, 15 deletions...l-templating/src/templates/partials/invManuscriptData.hbs
- packages/component-email-templating/src/templates/partials/invUpperContent.hbs 13 additions, 5 deletions...ail-templating/src/templates/partials/invUpperContent.hbs
- packages/component-email-templating/src/templates/partials/signature.hbs 5 additions, 4 deletions...ent-email-templating/src/templates/partials/signature.hbs
- packages/component-faraday-selectors/src/index.js 25 additions, 9 deletionspackages/component-faraday-selectors/src/index.js
- packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js 34 additions, 1 deletion...ponent-faraday-ui/src/contextualBoxes/HERecommendation.js
- packages/component-invite/src/routes/fragmentsInvitations/emails/emailCopy.js 7 additions, 6 deletions...nvite/src/routes/fragmentsInvitations/emails/emailCopy.js
- packages/component-invite/src/routes/fragmentsInvitations/emails/invitations.js 1 addition, 1 deletion...ite/src/routes/fragmentsInvitations/emails/invitations.js
- packages/component-manuscript/src/components/ManuscriptLayout.js 4 additions, 3 deletions...s/component-manuscript/src/components/ManuscriptLayout.js
- packages/component-manuscript/src/components/ManuscriptPage.js 7 additions, 1 deletion...ges/component-manuscript/src/components/ManuscriptPage.js
- packages/component-manuscript/src/components/ReviewsAndReports.js 0 additions, 157 deletions.../component-manuscript/src/components/ReviewsAndReports.js
- packages/component-manuscript/src/components/index.js 0 additions, 1 deletionpackages/component-manuscript/src/components/index.js
- packages/xpub-faraday/app/config/journal/metadata.js 2 additions, 2 deletionspackages/xpub-faraday/app/config/journal/metadata.js
Please register or sign in to comment