fix(authsomeHelpers): fix merge conflicts (9cd76cf2) · Commits · xpub / xpub-faraday

Commit 9cd76cf2 authored 6 years ago by

Tania Fecheta

Browse files

fix(authsomeHelpers): fix merge conflicts

parents 91d0d68e b0b661bb

No related branches found

No related tags found

3 merge requests!160Update staging with master features,!150Develop,!138Hin 991

Hide whitespace changes

Inline Side-by-side

Showing

README.md 6 additions, 0 deletions

README.md
packages/component-faraday-selectors/src/index.js 18 additions, 21 deletions

packages/component-faraday-selectors/src/index.js
packages/component-faraday-ui/src/ReviewerReportAuthor.js 32 additions, 20 deletions

packages/component-faraday-ui/src/ReviewerReportAuthor.js
packages/component-faraday-ui/src/Tag.js 31 additions, 17 deletions

packages/component-faraday-ui/src/Tag.js
packages/component-faraday-ui/src/contextualBoxes/AuthorReviews.js 12 additions, 3 deletions

...component-faraday-ui/src/contextualBoxes/AuthorReviews.js
packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js 1 addition, 1 deletion

...raday-ui/src/contextualBoxes/ResponseToRevisionRequest.js
packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js 29 additions, 25 deletions

...mponent-faraday-ui/src/contextualBoxes/ReviewerDetails.js
packages/component-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js 8 additions, 3 deletions

...nent-faraday-ui/src/manuscriptDetails/ManuscriptHeader.js
packages/component-fixture-manager/src/fixtures/collectionIDs.js 1 addition, 0 deletions

...s/component-fixture-manager/src/fixtures/collectionIDs.js
packages/component-fixture-manager/src/fixtures/collections.js 34 additions, 0 deletions

...ges/component-fixture-manager/src/fixtures/collections.js
packages/component-fixture-manager/src/fixtures/fragments.js 14 additions, 1 deletion

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

packages/component-fixture-manager/src/fixtures/teams.js
packages/component-helper-service/src/services/User.js 9 additions, 2 deletions

packages/component-helper-service/src/services/User.js
packages/component-invite/src/routes/fragmentsInvitations/post.js 20 additions, 8 deletions

.../component-invite/src/routes/fragmentsInvitations/post.js
packages/component-invite/src/tests/fragmentsInvitations/post.test.js 13 additions, 7 deletions

...ponent-invite/src/tests/fragmentsInvitations/post.test.js
packages/component-manuscript-manager/src/routes/collections/delete.js 11 additions, 4 deletions

...onent-manuscript-manager/src/routes/collections/delete.js
packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js 10 additions, 1 deletion

...cript-manager/src/routes/fragmentsRecommendations/post.js
packages/component-manuscript-manager/src/tests/collections/delete.test.js 65 additions, 0 deletions

...t-manuscript-manager/src/tests/collections/delete.test.js
packages/component-manuscript-manager/src/tests/fragmentsRecommendations/post.test.js 54 additions, 0 deletions

...t-manager/src/tests/fragmentsRecommendations/post.test.js
packages/component-manuscript/src/components/ManuscriptLayout.js 31 additions, 21 deletions

...s/component-manuscript/src/components/ManuscriptLayout.js

with 403 additions and 134 deletions

Please register or to comment