Merge branch 'shared-data-model' of gitlab.coko.foundation:xpub/xpub-epmc into shared-data-model (3d19988b) · 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

3d19988b

Commit 3d19988b authored 6 years ago by

Yogmatee Roochun

Downloads
- Plain Diff

Merge branch 'shared-data-model' of gitlab.coko.foundation:xpub/xpub-epmc into shared-data-model

parents 75d5e189 0547bcb2

No related branches found

No related tags found

2 merge requests!75Shared data model,!77Dev

Changes 16

Expand all Hide whitespace changes

Inline Side-by-side

Showing

app/components/activity/EventDescription.jsx 95 additions, 30 deletions

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

app/components/activity/MetaEdit.jsx
app/components/citation-search/PubMedSearch.jsx 7 additions, 1 deletion

app/components/citation-search/PubMedSearch.jsx
app/components/login/Login.jsx 2 additions, 1 deletion

app/components/login/Login.jsx
app/components/mailer/MailerContainer.jsx 1 addition, 1 deletion

app/components/mailer/MailerContainer.jsx
app/components/mailer/operations.js 2 additions, 2 deletions

app/components/mailer/operations.js
app/components/signup/Signup.jsx 0 additions, 6 deletions

app/components/signup/Signup.jsx
app/components/signup/SignupContainer.js 1 addition, 1 deletion

app/components/signup/SignupContainer.js
package.json 2 additions, 0 deletions

package.json
scripts/shared-data-model.sql 9 additions, 5 deletions

scripts/shared-data-model.sql
server/email/index.js 7 additions, 4 deletions

server/email/index.js
server/xpub-model/entities/role/data-access.js 6 additions, 6 deletions

server/xpub-model/entities/role/data-access.js
server/xpub-server/entities/email/resolvers.js 18 additions, 30 deletions

server/xpub-server/entities/email/resolvers.js
server/xpub-server/entities/email/typeDefs.graphqls 1 addition, 1 deletion

server/xpub-server/entities/email/typeDefs.graphqls
server/xpub-server/package.json 1 addition, 1 deletion

server/xpub-server/package.json
yarn.lock 1228 additions, 868 deletions

yarn.lock

with 1386 additions and 958 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