Merge branch 'development' into bugfix/#224-export-to-artemis-public-visibility
# Conflicts: # src/main/java/at/ac/uibk/gitsearch/service/SearchService.java
Showing
- .classpath 6 additions, 3 deletions.classpath
- .eslintrc.json 2 additions, 1 deletion.eslintrc.json
- .gitignore 41 additions, 0 deletions.gitignore
- .huskyrc 1 addition, 1 deletion.huskyrc
- package-lock.json 33558 additions, 823 deletionspackage-lock.json
- package.json 3 additions, 2 deletionspackage.json
- src/main/docker/gitsearch.yml 2 additions, 0 deletionssrc/main/docker/gitsearch.yml
- src/main/java/at/ac/uibk/gitsearch/service/ExerciseService.java 0 additions, 1 deletion...in/java/at/ac/uibk/gitsearch/service/ExerciseService.java
- src/main/java/at/ac/uibk/gitsearch/service/SearchService.java 1 addition, 0 deletions...main/java/at/ac/uibk/gitsearch/service/SearchService.java
- src/main/webapp/app/app-routing.module.ts 17 additions, 13 deletionssrc/main/webapp/app/app-routing.module.ts
- src/main/webapp/app/app.module.ts 2 additions, 1 deletionsrc/main/webapp/app/app.module.ts
- src/main/webapp/app/layouts/datapolicy/datapolicy.component.html 162 additions, 0 deletions...n/webapp/app/layouts/datapolicy/datapolicy.component.html
- src/main/webapp/app/layouts/datapolicy/datapolicy.component.scss 0 additions, 0 deletions...n/webapp/app/layouts/datapolicy/datapolicy.component.scss
- src/main/webapp/app/layouts/datapolicy/datapolicy.component.ts 15 additions, 0 deletions...ain/webapp/app/layouts/datapolicy/datapolicy.component.ts
- src/main/webapp/app/layouts/footer/footer.component.html 1 addition, 1 deletionsrc/main/webapp/app/layouts/footer/footer.component.html
- src/main/webapp/app/layouts/navbar/navbar.component.html 13 additions, 6 deletionssrc/main/webapp/app/layouts/navbar/navbar.component.html
- src/main/webapp/app/layouts/navbar/navbar.component.ts 23 additions, 17 deletionssrc/main/webapp/app/layouts/navbar/navbar.component.ts
- src/main/webapp/app/teaserContent/teaserContent.component.ts 4 additions, 4 deletionssrc/main/webapp/app/teaserContent/teaserContent.component.ts
- src/main/webapp/i18n/de/login.json 4 additions, 2 deletionssrc/main/webapp/i18n/de/login.json
- src/main/webapp/i18n/en/login.json 4 additions, 2 deletionssrc/main/webapp/i18n/en/login.json
Please register or sign in to comment