merge (cddc8b12) · Commits · xpub / xpub-faraday

Commit cddc8b12 authored 7 years ago by

Alexandru Munteanu

Browse files

merge

parents 040f3bee 1ecb7529

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

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 4 additions, 4 deletions

packages/components-faraday/src/components/AppBar/AppBar.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
packages/components-faraday/src/components/Dashboard/DashboardCard.js 3 additions, 1 deletion

...ponents-faraday/src/components/Dashboard/DashboardCard.js
packages/components-faraday/src/components/Dashboard/DashboardFilters.js 45 additions, 12 deletions

...ents-faraday/src/components/Dashboard/DashboardFilters.js
packages/components-faraday/src/components/Dashboard/DashboardItems.js 17 additions, 6 deletions

...onents-faraday/src/components/Dashboard/DashboardItems.js
packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js 12 additions, 5 deletions

...nts-faraday/src/components/SignUp/SignUpInvitationForm.js
packages/components-faraday/src/components/SignUp/SignUpStep0.js 2 additions, 1 deletion

...s/components-faraday/src/components/SignUp/SignUpStep0.js
packages/components-faraday/src/components/SignUp/SignUpStep1.js 2 additions, 1 deletion

...s/components-faraday/src/components/SignUp/SignUpStep1.js
packages/components-faraday/src/components/UIComponents/ConfirmationPage.js 31 additions, 7 deletions

...s-faraday/src/components/UIComponents/ConfirmationPage.js
packages/xpub-faraday/app/theme.js 1 addition, 1 deletion

packages/xpub-faraday/app/theme.js
packages/xpub-theme/src/variables.css 1 addition, 1 deletion

packages/xpub-theme/src/variables.css

with 249 additions and 296 deletions

Please register or to comment