Merge branch 'develop' into 'feature/42-add-user-login-signup'
# Conflicts: # src/app/modules/profile/profile-info/profile-info.component.html # src/app/modules/profile/profile-info/profile-info.component.ts
Branches
Showing
- src/app/app-routing.module.ts 4 additions, 0 deletionssrc/app/app-routing.module.ts
- src/app/app.component.html 3 additions, 1 deletionsrc/app/app.component.html
- src/app/app.component.ts 7 additions, 1 deletionsrc/app/app.component.ts
- src/app/modules/home/form-play-quiz/form-play-quiz.component.html 2 additions, 2 deletions...modules/home/form-play-quiz/form-play-quiz.component.html
- src/app/modules/home/home-page/home-page.component.css 3 additions, 11 deletionssrc/app/modules/home/home-page/home-page.component.css
- src/app/modules/home/home-page/home-page.component.html 4 additions, 4 deletionssrc/app/modules/home/home-page/home-page.component.html
- src/app/modules/home/home.module.ts 3 additions, 2 deletionssrc/app/modules/home/home.module.ts
- src/app/modules/home/my-quiz/my-quiz.component.css 8 additions, 21 deletionssrc/app/modules/home/my-quiz/my-quiz.component.css
- src/app/modules/home/my-quiz/my-quiz.component.html 4 additions, 45 deletionssrc/app/modules/home/my-quiz/my-quiz.component.html
- src/app/modules/home/my-quiz/my-quiz.component.ts 25 additions, 0 deletionssrc/app/modules/home/my-quiz/my-quiz.component.ts
- src/app/modules/profile/create-custom-quiz/create-custom-quiz.component.css 186 additions, 26 deletions...ofile/create-custom-quiz/create-custom-quiz.component.css
- src/app/modules/profile/create-custom-quiz/create-custom-quiz.component.html 77 additions, 66 deletions...file/create-custom-quiz/create-custom-quiz.component.html
- src/app/modules/profile/create-custom-quiz/create-custom-quiz.component.ts 42 additions, 9 deletions...rofile/create-custom-quiz/create-custom-quiz.component.ts
- src/app/modules/profile/profile-info/profile-info.component.css 21 additions, 22 deletions...p/modules/profile/profile-info/profile-info.component.css
- src/app/modules/profile/profile-info/profile-info.component.html 5 additions, 9 deletions.../modules/profile/profile-info/profile-info.component.html
- src/app/shared/header/header.component.css 5 additions, 0 deletionssrc/app/shared/header/header.component.css
- src/app/shared/header/header.component.html 10 additions, 4 deletionssrc/app/shared/header/header.component.html
- src/app/shared/header/header.component.ts 32 additions, 2 deletionssrc/app/shared/header/header.component.ts
- src/styles.css 36 additions, 5 deletionssrc/styles.css
Please register or sign in to comment