fix merge conflicts (626a9760) · Commits · xpub / xpub-faraday · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

X

xpub-faraday
- Activity
- Members
- Labels
- Issues
  2
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Releases
- Container Registry
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

626a9760

Commit 626a9760 authored 6 years ago by

Alexandru Munteanu

Downloads
- Plain Diff

fix merge conflicts

parents bf5eb8f4 b3413b32

No related branches found

No related tags found

1 merge request!8Sprint #10

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-manuscript-manager/src/helpers/authsome.js 29 additions, 0 deletions

...ages/component-manuscript-manager/src/helpers/authsome.js
packages/component-manuscript-manager/src/routes/fragmentsRecommendations/patch.js 15 additions, 3 deletions

...ript-manager/src/routes/fragmentsRecommendations/patch.js
packages/component-manuscript-manager/src/routes/fragmentsRecommendations/post.js 14 additions, 0 deletions

...cript-manager/src/routes/fragmentsRecommendations/post.js
packages/component-manuscript/src/components/ManuscriptVersion.js 1 addition, 1 deletion

.../component-manuscript/src/components/ManuscriptVersion.js
packages/component-manuscript/src/components/ReviewerReportForm.js 43 additions, 37 deletions

...component-manuscript/src/components/ReviewerReportForm.js
packages/component-manuscript/src/components/utils.js 10 additions, 9 deletions

packages/component-manuscript/src/components/utils.js
packages/components-faraday/src/components/Dashboard/HandlingEditorSection.js 1 addition, 1 deletion

...faraday/src/components/Dashboard/HandlingEditorSection.js
packages/components-faraday/src/components/Files/FileItem.js 4 additions, 3 deletions

packages/components-faraday/src/components/Files/FileItem.js
packages/components-faraday/src/redux/recommendations.js 0 additions, 7 deletions

packages/components-faraday/src/redux/recommendations.js
packages/xpub-faraday/app/config/journal/recommendations.js 9 additions, 8 deletions

packages/xpub-faraday/app/config/journal/recommendations.js
packages/xpub-faraday/config/authsome-helpers.js 19 additions, 3 deletions

packages/xpub-faraday/config/authsome-helpers.js
packages/xpub-faraday/config/authsome-mode.js 25 additions, 11 deletions

packages/xpub-faraday/config/authsome-mode.js

with 170 additions and 83 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment