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

ea4664bb

Commit ea4664bb authored 6 years ago by

Bogdan Cochior

Downloads
- Plain Diff

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

parents e7d1bd6d fd64c416

No related branches found

No related tags found

1 merge request!14Sprint #15

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

packages/component-helper-service/src/services/User.js 6 additions, 0 deletions

packages/component-helper-service/src/services/User.js
packages/component-mail-service/src/Mail.js 18 additions, 3 deletions

packages/component-mail-service/src/Mail.js
packages/component-mail-service/src/helpers/helpers.js 4 additions, 4 deletions

packages/component-mail-service/src/helpers/helpers.js
packages/component-mail-service/src/templates/partials/footer.hbs 1 addition, 1 deletion

.../component-mail-service/src/templates/partials/footer.hbs
packages/component-user-manager/src/Users.js 10 additions, 4 deletions

packages/component-user-manager/src/Users.js
packages/component-user-manager/src/routes/users/subscribe.js 4 additions, 3 deletions

...ages/component-user-manager/src/routes/users/subscribe.js
packages/components-faraday/src/components/Admin/utils.js 6 additions, 0 deletions

packages/components-faraday/src/components/Admin/utils.js
packages/components-faraday/src/components/UserProfile/Unsubscribe.js 63 additions, 0 deletions

...ponents-faraday/src/components/UserProfile/Unsubscribe.js
packages/components-faraday/src/components/UserProfile/UserProfilePage.js 1 addition, 1 deletion

...nts-faraday/src/components/UserProfile/UserProfilePage.js
packages/components-faraday/src/components/UserProfile/index.js 1 addition, 0 deletions

...es/components-faraday/src/components/UserProfile/index.js
packages/components-faraday/src/redux/users.js 3 additions, 7 deletions

packages/components-faraday/src/redux/users.js
packages/xpub-faraday/app/routes.js 3 additions, 0 deletions

packages/xpub-faraday/app/routes.js
packages/xpub-faraday/config/default.js 3 additions, 0 deletions

packages/xpub-faraday/config/default.js
packages/xpub-faraday/config/validations.js 6 additions, 1 deletion

packages/xpub-faraday/config/validations.js

with 129 additions and 24 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