Merge branch 'development' into '286-gitlab-messages-wieder-in-austauschplattform-einblenden'
# Conflicts: # src/main/webapp/app/layouts/main/main.component.html
Showing
- src/main/java/at/ac/uibk/gitsearch/config/SecurityConfiguration.java 2 additions, 2 deletions...va/at/ac/uibk/gitsearch/config/SecurityConfiguration.java
- src/main/webapp/app/exercise/exercise-details/exercise-details.component.html 9 additions, 8 deletions...exercise/exercise-details/exercise-details.component.html
- src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts 7 additions, 5 deletions...p/exercise/exercise-details/exercise-details.component.ts
- src/main/webapp/app/layouts/main/main.component.html 1 addition, 1 deletionsrc/main/webapp/app/layouts/main/main.component.html
- src/main/webapp/app/layouts/main/main.component.scss 16 additions, 0 deletionssrc/main/webapp/app/layouts/main/main.component.scss
- src/main/webapp/app/layouts/main/main.component.ts 1 addition, 0 deletionssrc/main/webapp/app/layouts/main/main.component.ts
- src/main/webapp/app/layouts/navbar/navbar.component.html 111 additions, 114 deletionssrc/main/webapp/app/layouts/navbar/navbar.component.html
- src/main/webapp/app/layouts/navbar/navbar.component.ts 3 additions, 2 deletionssrc/main/webapp/app/layouts/navbar/navbar.component.ts
- src/main/webapp/app/login/login.component.html 83 additions, 44 deletionssrc/main/webapp/app/login/login.component.html
- src/main/webapp/app/login/login.component.ts 28 additions, 2 deletionssrc/main/webapp/app/login/login.component.ts
- src/main/webapp/app/search/search-input/search-input.component.scss 7 additions, 0 deletions...ebapp/app/search/search-input/search-input.component.scss
- src/main/webapp/content/scss/navbar.scss 1 addition, 1 deletionsrc/main/webapp/content/scss/navbar.scss
- src/main/webapp/i18n/de/login.json 2 additions, 1 deletionsrc/main/webapp/i18n/de/login.json
- src/main/webapp/i18n/de/oauth2.json 1 addition, 1 deletionsrc/main/webapp/i18n/de/oauth2.json
- src/main/webapp/i18n/en/login.json 2 additions, 1 deletionsrc/main/webapp/i18n/en/login.json
- src/main/webapp/i18n/en/oauth2.json 1 addition, 1 deletionsrc/main/webapp/i18n/en/oauth2.json
- src/test/javascript/e2e/account/account.spec.ts 1 addition, 4 deletionssrc/test/javascript/e2e/account/account.spec.ts
- src/test/javascript/e2e/page-objects/jhi-page-objects.ts 4 additions, 0 deletionssrc/test/javascript/e2e/page-objects/jhi-page-objects.ts
Please register or sign in to comment