Merge remote-tracking branch 'origin/shared-data-model' into shared-data-model (28913bb2) · Commits · Literature-services / public-projects / xpub-epmc · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

X

xpub-epmc
- Activity
- Members
- Labels
- Wiki
- Terraform modules

Snippets Groups Projects

28913bb2

Commit 28913bb2 authored 6 years ago by

Nikos Marinos

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/shared-data-model' into shared-data-model

parents cb1a18f9 91bdad6e

No related branches found

No related tags found

2 merge requests!90Dev,!89Shared data model

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

app/components/App.jsx 3 additions, 6 deletions

app/components/App.jsx
app/components/GrantSearch.jsx 2 additions, 2 deletions

app/components/GrantSearch.jsx
app/components/SubmissionHeader.jsx 0 additions, 5 deletions

app/components/SubmissionHeader.jsx
app/components/review-wizard/Review.jsx 14 additions, 36 deletions

app/components/review-wizard/Review.jsx
app/components/submission-wizard/CreatePage.jsx 8 additions, 7 deletions

app/components/submission-wizard/CreatePage.jsx
app/components/submission-wizard/Submit.jsx 8 additions, 8 deletions

app/components/submission-wizard/Submit.jsx
app/components/ui/atoms/PreviewPage.jsx 10 additions, 18 deletions

app/components/ui/atoms/PreviewPage.jsx
app/components/ui/atoms/SplitPage.jsx 2 additions, 5 deletions

app/components/ui/atoms/SplitPage.jsx
package.json 1 addition, 1 deletion

package.json
server/annotator/app.js 8 additions, 8 deletions

server/annotator/app.js
server/eutils/api.js 4 additions, 5 deletions

server/eutils/api.js
server/grist/api.js 4 additions, 3 deletions

server/grist/api.js
yarn.lock 1 addition, 1 deletion

yarn.lock

with 65 additions and 105 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