Merge branch 'master' of gitlab.coko.foundation:xpub/xpub-faraday (4cd0692a) · Commits · xpub / xpub-faraday

Commit 4cd0692a authored 7 years ago by

Vlad

Browse files

Merge branch 'master' of gitlab.coko.foundation:xpub/xpub-faraday

parents 076cfbc4 cc34ab08

No related branches found

No related tags found

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 1 addition, 1 deletion

.gitlab-ci.yml
packages/component-invite/config/test.js 3 additions, 2 deletions

packages/component-invite/config/test.js
packages/component-invite/src/controllers/assignCollectionRole.js 32 additions, 13 deletions

.../component-invite/src/controllers/assignCollectionRole.js
packages/component-invite/src/controllers/inviteGlobalRole.js 8 additions, 23 deletions

...ages/component-invite/src/controllers/inviteGlobalRole.js
packages/component-invite/src/helpers/Team.js 5 additions, 1 deletion

packages/component-invite/src/helpers/Team.js
packages/component-invite/src/helpers/User.js 40 additions, 0 deletions

packages/component-invite/src/helpers/User.js
packages/component-invite/src/routes/postInvite.js 1 addition, 0 deletions

packages/component-invite/src/routes/postInvite.js
packages/component-invite/src/tests/fixtures/collections.js 9 additions, 1 deletion

packages/component-invite/src/tests/fixtures/collections.js
packages/component-invite/src/tests/fixtures/userData.js 6 additions, 0 deletions

packages/component-invite/src/tests/fixtures/userData.js
packages/component-invite/src/tests/fixtures/users.js 19 additions, 1 deletion

packages/component-invite/src/tests/fixtures/users.js
packages/component-invite/src/tests/postInvite.test.js 58 additions, 2 deletions

packages/component-invite/src/tests/postInvite.test.js
packages/component-mail-service/src/Mail.js 12 additions, 16 deletions

packages/component-mail-service/src/Mail.js
packages/component-mail-service/src/templates/assign-coauthor.html 234 additions, 0 deletions

...component-mail-service/src/templates/assign-coauthor.html
packages/component-mail-service/src/templates/assign-coauthor.txt 7 additions, 0 deletions

.../component-mail-service/src/templates/assign-coauthor.txt
packages/component-mail-service/src/templates/handling-editor-declined.html 1 addition, 0 deletions

...-mail-service/src/templates/handling-editor-declined.html
packages/component-mail-service/src/templates/invite-coauthor.html 234 additions, 0 deletions

...component-mail-service/src/templates/invite-coauthor.html
packages/component-mail-service/src/templates/invite-coauthor.txt 7 additions, 0 deletions

.../component-mail-service/src/templates/invite-coauthor.txt
packages/components-faraday/src/components/Dashboard/DashboardCard.js 1 addition, 0 deletions

...ponents-faraday/src/components/Dashboard/DashboardCard.js
packages/components-faraday/src/components/Dashboard/EditorInChiefActions.js 4 additions, 4 deletions

...-faraday/src/components/Dashboard/EditorInChiefActions.js
packages/components-faraday/src/components/Dashboard/HandlingEditorActions.js 22 additions, 6 deletions

...faraday/src/components/Dashboard/HandlingEditorActions.js

with 704 additions and 70 deletions

Please register or to comment