Merge branch 'develop' of gitlab.coko.foundation:xpub/xpub-faraday into HIN-1138-Country-Menu (cfff7239) · Commits · xpub / xpub-faraday

Commit cfff7239 authored 6 years ago by

MB Pro

Browse files

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

parents 2bc05bf3 c5e2c87f

No related branches found

No related tags found

3 merge requests!222Sprint #26,!217Sprint #26,!207Hin 1138 country menu

Hide whitespace changes

Inline Side-by-side

Showing

package.json 9 additions, 3 deletions

package.json
packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js 8 additions, 2 deletions

...ponent-faraday-ui/src/contextualBoxes/HERecommendation.js
packages/component-faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js 2 additions, 0 deletions

...faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js
packages/component-helper-service/src/services/User.js 7 additions, 0 deletions

packages/component-helper-service/src/services/User.js
packages/component-helper-service/src/tests/user.test.js 40 additions, 0 deletions

packages/component-helper-service/src/tests/user.test.js
packages/component-manuscript-manager/src/notifications/emailCopy.js 22 additions, 2 deletions

...mponent-manuscript-manager/src/notifications/emailCopy.js
packages/component-manuscript-manager/src/notifications/notification.js 54 additions, 16 deletions

...nent-manuscript-manager/src/notifications/notification.js
packages/component-manuscript-manager/src/routes/collections/delete.js 1 addition, 1 deletion

...onent-manuscript-manager/src/routes/collections/delete.js
packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js 9 additions, 3 deletions

...nager/src/routes/fragments/notifications/notifications.js
packages/component-manuscript-manager/src/routes/fragments/patch.js 3 additions, 0 deletions

...omponent-manuscript-manager/src/routes/fragments/patch.js
packages/component-manuscript-manager/src/routes/fragments/strategies/heRequestRevision.js 11 additions, 1 deletion

...ager/src/routes/fragments/strategies/heRequestRevision.js
packages/component-manuscript/src/handleRecommendation/withHandleRecommendation.js 12 additions, 7 deletions

...ript/src/handleRecommendation/withHandleRecommendation.js
packages/component-user-manager/src/routes/fragmentsUsers/emails/notifications.js 11 additions, 10 deletions

...manager/src/routes/fragmentsUsers/emails/notifications.js
packages/component-user/server/notifications/emailCopy.js 13 additions, 13 deletions

packages/component-user/server/notifications/emailCopy.js
packages/component-user/server/notifications/notification.js 3 additions, 5 deletions

packages/component-user/server/notifications/notification.js
packages/component-user/server/resolvers.js 2 additions, 1 deletion

packages/component-user/server/resolvers.js
packages/component-user/server/tests/createUserAsAdmin.test.js 2 additions, 1 deletion

...ges/component-user/server/tests/createUserAsAdmin.test.js
packages/component-user/server/use-cases/createUserAsAdmin.js 1 addition, 1 deletion

...ages/component-user/server/use-cases/createUserAsAdmin.js
packages/component-wizard/src/components/SubmissionWizard.js 61 additions, 48 deletions

packages/component-wizard/src/components/SubmissionWizard.js
packages/components-faraday/src/components/UIComponents/NotFound.js 6 additions, 2 deletions

...omponents-faraday/src/components/UIComponents/NotFound.js

with 277 additions and 116 deletions

Please register or to comment