Merge branch 'develop' into 'master' (959f6e3f) · Commits · xpub / xpub-faraday

Commit 959f6e3f authored 6 years ago by

Bogdan Cochior

Merge branch 'develop' into 'master'

Sprint #15

See merge request !14

parents b7e5a32a b5630d92

No related branches found

No related tags found

2 merge requests!85Hin 904,!14Sprint #15

Hide whitespace changes

Inline Side-by-side

Showing

.gitlab-ci.yml 4 additions, 4 deletions

.gitlab-ci.yml
packages/component-faraday-selectors/src/index.js 16 additions, 10 deletions

packages/component-faraday-selectors/src/index.js
packages/component-fixture-manager/src/fixtures/collections.js 2 additions, 2 deletions

...ges/component-fixture-manager/src/fixtures/collections.js
packages/component-fixture-manager/src/fixtures/fragments.js 28 additions, 31 deletions

packages/component-fixture-manager/src/fixtures/fragments.js
packages/component-fixture-manager/src/fixtures/teams.js 2 additions, 2 deletions

packages/component-fixture-manager/src/fixtures/teams.js
packages/component-fixture-manager/src/fixtures/userData.js 2 additions, 0 deletions

packages/component-fixture-manager/src/fixtures/userData.js
packages/component-fixture-manager/src/fixtures/users.js 132 additions, 1 deletion

packages/component-fixture-manager/src/fixtures/users.js
packages/component-fixture-manager/src/helpers/Model.js 6 additions, 3 deletions

packages/component-fixture-manager/src/helpers/Model.js
packages/component-fixture-manager/src/mocks/Fragment.js 20 additions, 0 deletions

packages/component-fixture-manager/src/mocks/Fragment.js
packages/component-helper-service/src/services/Email.js 109 additions, 35 deletions

packages/component-helper-service/src/services/Email.js
packages/component-helper-service/src/services/Fragment.js 30 additions, 10 deletions

packages/component-helper-service/src/services/Fragment.js
packages/component-helper-service/src/services/Invitation.js 6 additions, 8 deletions

packages/component-helper-service/src/services/Invitation.js
packages/component-helper-service/src/services/User.js 19 additions, 0 deletions

packages/component-helper-service/src/services/User.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/fragmentsInvitations/decline.js 11 additions, 4 deletions

...mponent-invite/src/routes/fragmentsInvitations/decline.js
packages/component-invite/src/routes/fragmentsInvitations/get.js 3 additions, 2 deletions

...s/component-invite/src/routes/fragmentsInvitations/get.js
packages/component-invite/src/routes/fragmentsInvitations/patch.js 10 additions, 2 deletions

...component-invite/src/routes/fragmentsInvitations/patch.js
packages/component-invite/src/routes/fragmentsInvitations/post.js 10 additions, 2 deletions

.../component-invite/src/routes/fragmentsInvitations/post.js
packages/component-invite/src/tests/collectionsInvitations/patch.test.js 0 additions, 18 deletions

...ent-invite/src/tests/collectionsInvitations/patch.test.js
packages/component-invite/src/tests/fragmentsInvitations/decline.test.js 26 additions, 0 deletions

...ent-invite/src/tests/fragmentsInvitations/decline.test.js

with 438 additions and 137 deletions

Please register or to comment