Merge remote-tracking branch 'origin/shared-data-model' into shared-data-model (013a28ff) · 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

013a28ff

Commit 013a28ff authored 6 years ago by

Nikos Marinos

Downloads
- Plain Diff

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

parents e9f49b45 1ffb9001

No related branches found

No related tags found

2 merge requests!86Dev,!82Shared data model

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

app/components/activity/EventDescription.jsx 13 additions, 1 deletion

app/components/activity/EventDescription.jsx
app/components/activity/MetaEdit.jsx 57 additions, 1 deletion

app/components/activity/MetaEdit.jsx
app/components/activity/MetaSec.jsx 97 additions, 78 deletions

app/components/activity/MetaSec.jsx
app/components/activity/QuickView.jsx 1 addition, 12 deletions

app/components/activity/QuickView.jsx
app/components/dashboard/DashboardPage.jsx 3 additions, 1 deletion

app/components/dashboard/DashboardPage.jsx
server/ftp-integration/taggedXML.js 1 addition, 1 deletion

server/ftp-integration/taggedXML.js
server/utils/db.js 29 additions, 17 deletions

server/utils/db.js
server/utils/user.js 1 addition, 4 deletions

server/utils/user.js
server/xmlValidation/index.js 1 addition, 1 deletion

server/xmlValidation/index.js
server/xpub-model/entities/file/data-access.js 1 addition, 1 deletion

server/xpub-model/entities/file/data-access.js
yarn.lock 83 additions, 98 deletions

yarn.lock

with 287 additions and 215 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