Merge branch 'dev' into 'master' (632356fb) · 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

632356fb

Commit 632356fb authored 5 years ago by

Audrey Hamelers

Downloads
- Plain Diff

Merge branch 'dev' into 'master'

Dev

See merge request xpub/xpub-epmc!119

parents d8117a15 6bd3c786

No related branches found

No related tags found

1 merge request!119Dev

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

app/components/dashboard/AdminDashboard.jsx 2 additions, 2 deletions

app/components/dashboard/AdminDashboard.jsx
docker-compose.prod.yml 2 additions, 2 deletions

docker-compose.prod.yml
server/ncbi-integration/fromNcbi.js 60 additions, 34 deletions

server/ncbi-integration/fromNcbi.js
server/ncbi-integration/toNcbi.js 47 additions, 20 deletions

server/ncbi-integration/toNcbi.js
server/privacyNotice/privacyNoticeCheck.js 6 additions, 4 deletions

server/privacyNotice/privacyNoticeCheck.js
server/xpub-model/entities/manuscript/index.js 0 additions, 1 deletion

server/xpub-model/entities/manuscript/index.js
server/xpub-model/entities/team/data-access.js 2 additions, 2 deletions

server/xpub-model/entities/team/data-access.js
wrapperScript.sh 1 addition, 1 deletion

wrapperScript.sh

with 120 additions and 66 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