Merge branch 'development' into
136-umstellung-connectior-plugin-auf-v0-1-2 (part 1) Conflicts: pom.xml src/main/java/at/ac/uibk/gitsearch/service/dto/SearchInputMetadataDTO.java src/main/resources/config/application-dev.yml src/main/resources/config/application-prod.yml src/main/resources/config/application-staging.yml src/test/resources/config/application.yml
Showing
- src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java 121 additions, 76 deletions.../uibk/gitsearch/repository/search/MetaDataRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/SearchRepositoryConstants.java 3 additions, 0 deletions...itsearch/repository/search/SearchRepositoryConstants.java
- src/main/java/at/ac/uibk/gitsearch/service/SearchService.java 11 additions, 0 deletions...main/java/at/ac/uibk/gitsearch/service/SearchService.java
- src/main/java/at/ac/uibk/gitsearch/service/dto/SearchInputMetadataDTO.java 22 additions, 4 deletions...ac/uibk/gitsearch/service/dto/SearchInputMetadataDTO.java
- src/main/java/at/ac/uibk/gitsearch/web/rest/SearchResource.java 12 additions, 0 deletions...in/java/at/ac/uibk/gitsearch/web/rest/SearchResource.java
- src/main/resources/config/application-dev.yml 5 additions, 5 deletionssrc/main/resources/config/application-dev.yml
- src/main/resources/config/application-prod.yml 4 additions, 3 deletionssrc/main/resources/config/application-prod.yml
- src/main/resources/config/application-staging.yml 2 additions, 3 deletionssrc/main/resources/config/application-staging.yml
- src/main/webapp/app/app.module.ts 0 additions, 1 deletionsrc/main/webapp/app/app.module.ts
- src/main/webapp/app/bookmarks/bookmarks.component.scss 1 addition, 2 deletionssrc/main/webapp/app/bookmarks/bookmarks.component.scss
- src/main/webapp/app/bookmarks/bookmarks.component.ts 263 additions, 256 deletionssrc/main/webapp/app/bookmarks/bookmarks.component.ts
- src/main/webapp/app/bookmarks/bookmarks.route.ts 1 addition, 3 deletionssrc/main/webapp/app/bookmarks/bookmarks.route.ts
- src/main/webapp/app/entities/user-watch-list/user-watch-list.service.ts 3 additions, 5 deletions...p/app/entities/user-watch-list/user-watch-list.service.ts
- src/main/webapp/app/entities/watch-list-entry/watch-list-entry.service.ts 4 additions, 7 deletions...app/entities/watch-list-entry/watch-list-entry.service.ts
- src/main/webapp/app/exercise/bookmarkInfo/bookmarkInfo.component.ts 16 additions, 24 deletions...ebapp/app/exercise/bookmarkInfo/bookmarkInfo.component.ts
- src/main/webapp/app/exercise/exercise-card/exercise-card.component.ts 37 additions, 37 deletions...app/app/exercise/exercise-card/exercise-card.component.ts
- src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts 10 additions, 15 deletions...p/exercise/exercise-details/exercise-details.component.ts
- src/main/webapp/app/layouts/navbar/navbar.component.ts 8 additions, 9 deletionssrc/main/webapp/app/layouts/navbar/navbar.component.ts
- src/main/webapp/app/search-old/search.scss 4 additions, 0 deletionssrc/main/webapp/app/search-old/search.scss
- src/main/webapp/app/search/search-input/search-input.component.html 29 additions, 1 deletion...ebapp/app/search/search-input/search-input.component.html
Please register or sign in to comment