Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master (30ff83df) · 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.

30ff83df

Commit 30ff83df authored 7 years ago by

Bogdan Cochior

Downloads
- Plain Diff

Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master

# Conflicts:
#	packages/component-wizard/src/components/SortableList.js

parents a2813660 dee6dda6

No related branches found

No related tags found

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

packages/component-wizard/src/components/AuthorList.js 110 additions, 86 deletions

packages/component-wizard/src/components/AuthorList.js
packages/component-wizard/src/components/AuthorList.local.scss 60 additions, 8 deletions

...ges/component-wizard/src/components/AuthorList.local.scss
packages/component-wizard/src/components/SortableList.js 24 additions, 24 deletions

packages/component-wizard/src/components/SortableList.js
packages/component-wizard/src/components/SortableList.local.scss 0 additions, 5 deletions

...s/component-wizard/src/components/SortableList.local.scss
packages/xpub-faraday-server/package.json 9 additions, 2 deletions

packages/xpub-faraday-server/package.json
packages/xpub-faraday-server/src/AuthorBackend.js 10 additions, 4 deletions

packages/xpub-faraday-server/src/AuthorBackend.js
packages/xpub-faraday-server/src/AuthorBackend.test.js 53 additions, 0 deletions

packages/xpub-faraday-server/src/AuthorBackend.test.js
packages/xpub-faraday/app/config/journal/submit-wizard.js 5 additions, 0 deletions

packages/xpub-faraday/app/config/journal/submit-wizard.js
packages/xpub-faraday/config/validations.js 5 additions, 5 deletions

packages/xpub-faraday/config/validations.js
packages/xpub-faraday/package.json 3 additions, 3 deletions

packages/xpub-faraday/package.json
yarn.lock 813 additions, 32 deletions

yarn.lock

with 1092 additions and 169 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