Merge branch 'dev' into 'feat/change-email'
# Conflicts: # src/app/app-routing.module.ts # src/app/app.module.ts
Showing
- Dockerfile 1 addition, 2 deletionsDockerfile
- angular.json 9 additions, 2 deletionsangular.json
- nginx/dev.conf 22 additions, 7 deletionsnginx/dev.conf
- src/app/app-routing.module.ts 5 additions, 0 deletionssrc/app/app-routing.module.ts
- src/app/app.module.ts 2 additions, 0 deletionssrc/app/app.module.ts
- src/app/reset-password/reset-password.component.html 66 additions, 0 deletionssrc/app/reset-password/reset-password.component.html
- src/app/reset-password/reset-password.component.spec.ts 25 additions, 0 deletionssrc/app/reset-password/reset-password.component.spec.ts
- src/app/reset-password/reset-password.component.ts 95 additions, 0 deletionssrc/app/reset-password/reset-password.component.ts
- src/app/services/auth.service.ts 11 additions, 0 deletionssrc/app/services/auth.service.ts
- src/app/shared/components/signup-modal/signup-modal.component.html 1 addition, 0 deletions...hared/components/signup-modal/signup-modal.component.html
- src/app/shared/components/signup-modal/signup-modal.component.ts 5 additions, 0 deletions.../shared/components/signup-modal/signup-modal.component.ts
- src/index.html 1 addition, 1 deletionsrc/index.html
Loading
Please register or sign in to comment