Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

Spring2021-SellPoint
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

b274cd78

Commit b274cd78 authored 4 years ago by Jonny Ngo Luong

Downloads
- Plain Diff

Merge branch 'master' into '24-password-input-component'

# Conflicts:
#   client/src/app/authentication/auth.service.ts

parents 5a5fa1ac 2658024b

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

client/src/app/authentication/auth.service.ts 15 additions, 3 deletions

client/src/app/authentication/auth.service.ts
client/src/app/users/user-login-form/user-login-form.component.ts 4 additions, 12 deletions

...rc/app/users/user-login-form/user-login-form.component.ts
client/src/app/users/user-profile/user-profile.component.ts 2 additions, 1 deletion

client/src/app/users/user-profile/user-profile.component.ts
client/src/app/users/user-registration-form/user-registration-form.component.ts 4 additions, 4 deletions

...ser-registration-form/user-registration-form.component.ts
client/src/app/users/user.service.ts 1 addition, 3 deletions

client/src/app/users/user.service.ts

with 26 additions and 23 deletions

Loading

0% Loading 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