Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master (d3a86b5f) · Commits · xpub / xpub-faraday

Commit d3a86b5f authored 7 years ago by

Sebastian

Browse files

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

parents 81fef54f 56fd9652

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-modal/src/components/Modal.js 4 additions, 3 deletions

packages/component-modal/src/components/Modal.js
packages/component-wizard/src/components/AutosaveIndicator.js 7 additions, 3 deletions

...ages/component-wizard/src/components/AutosaveIndicator.js
packages/component-wizard/src/components/WizardStep.js 13 additions, 8 deletions

packages/component-wizard/src/components/WizardStep.js
packages/components-faraday/src/components/Admin/AddEditUser.js 6 additions, 2 deletions

...es/components-faraday/src/components/Admin/AddEditUser.js
packages/components-faraday/src/components/Admin/AddUserForm.js 11 additions, 2 deletions

...es/components-faraday/src/components/Admin/AddUserForm.js
packages/components-faraday/src/components/Admin/AdminDashboard.js 14 additions, 13 deletions

...components-faraday/src/components/Admin/AdminDashboard.js
packages/components-faraday/src/components/Admin/AdminUsers.js 31 additions, 25 deletions

...ges/components-faraday/src/components/Admin/AdminUsers.js
packages/components-faraday/src/components/Admin/EditUserForm.js 19 additions, 3 deletions

...s/components-faraday/src/components/Admin/EditUserForm.js
packages/components-faraday/src/components/Admin/Pagination.js 16 additions, 11 deletions

...ges/components-faraday/src/components/Admin/Pagination.js
packages/components-faraday/src/components/AppBar/AppBar.js 23 additions, 11 deletions

packages/components-faraday/src/components/AppBar/AppBar.js
packages/components-faraday/src/components/AuthorList/Author.js 4 additions, 5 deletions

...es/components-faraday/src/components/AuthorList/Author.js
packages/components-faraday/src/components/AuthorList/AuthorAdder.js 45 additions, 15 deletions

...mponents-faraday/src/components/AuthorList/AuthorAdder.js
packages/components-faraday/src/components/AuthorList/AuthorEditor.js 14 additions, 8 deletions

...ponents-faraday/src/components/AuthorList/AuthorEditor.js
packages/components-faraday/src/components/AuthorList/AuthorList.js 1 addition, 1 deletion

...omponents-faraday/src/components/AuthorList/AuthorList.js
packages/components-faraday/src/components/AuthorList/AuthorList.local.scss 0 additions, 134 deletions

...s-faraday/src/components/AuthorList/AuthorList.local.scss
packages/components-faraday/src/components/AuthorList/FormItems.js 53 additions, 23 deletions

...components-faraday/src/components/AuthorList/FormItems.js
packages/components-faraday/src/components/AuthorList/FormItems.local.scss 0 additions, 37 deletions

...ts-faraday/src/components/AuthorList/FormItems.local.scss
packages/components-faraday/src/components/Dashboard/AbstractModal.js 17 additions, 15 deletions

...ponents-faraday/src/components/Dashboard/AbstractModal.js
packages/components-faraday/src/components/Dashboard/Dashboard.js 34 additions, 8 deletions

.../components-faraday/src/components/Dashboard/Dashboard.js
packages/components-faraday/src/components/Dashboard/Dashboard.local.scss 0 additions, 193 deletions

...nts-faraday/src/components/Dashboard/Dashboard.local.scss

with 312 additions and 520 deletions

Please register or to comment