Merge branch 'development' into 'achievements'
# Conflicts: # src/main/resources/.h2.server.properties # src/main/webapp/app/exercise/service/exercise.service.ts
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/java/at/ac/uibk/gitsearch/service/LikesQueryService.java 0 additions, 3 deletions.../java/at/ac/uibk/gitsearch/service/LikesQueryService.java
- src/main/java/at/ac/uibk/gitsearch/service/SearchService.java 44 additions, 19 deletions...main/java/at/ac/uibk/gitsearch/service/SearchService.java
- src/main/java/at/ac/uibk/gitsearch/web/rest/LikesResource.java 60 additions, 18 deletions...ain/java/at/ac/uibk/gitsearch/web/rest/LikesResource.java
- src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java 18 additions, 15 deletions...ava/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java
- src/main/resources/.h2.server.properties 1 addition, 1 deletionsrc/main/resources/.h2.server.properties
- src/main/resources/config/liquibase/changelog/20211407105122_added_Index_exerciseID.xml 19 additions, 0 deletions...ibase/changelog/20211407105122_added_Index_exerciseID.xml
- src/main/resources/config/liquibase/master.xml 1 addition, 0 deletionssrc/main/resources/config/liquibase/master.xml
- src/main/webapp/app/entities/likes/likes-update.component.html 5 additions, 9 deletions...ain/webapp/app/entities/likes/likes-update.component.html
- src/main/webapp/app/entities/likes/likes.component.html 2 additions, 2 deletionssrc/main/webapp/app/entities/likes/likes.component.html
- src/main/webapp/app/entities/likes/likes.service.ts 4 additions, 4 deletionssrc/main/webapp/app/entities/likes/likes.service.ts
- src/main/webapp/app/exercise/exercise-card/exercise-card.component.ts 8 additions, 28 deletions...app/app/exercise/exercise-card/exercise-card.component.ts
- src/main/webapp/app/exercise/exercise-details/exercise-details.component.html 2 additions, 2 deletions...exercise/exercise-details/exercise-details.component.html
- src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts 6 additions, 5 deletions...p/exercise/exercise-details/exercise-details.component.ts
- src/main/webapp/app/exercise/service/exercise.service.ts 35 additions, 1 deletionsrc/main/webapp/app/exercise/service/exercise.service.ts
- src/main/webapp/i18n/de/likes.json 1 addition, 1 deletionsrc/main/webapp/i18n/de/likes.json
- src/main/webapp/i18n/en/likes.json 1 addition, 1 deletionsrc/main/webapp/i18n/en/likes.json
- src/test/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java 15 additions, 11 deletions...t/java/at/ac/uibk/gitsearch/web/rest/LikesResourceIT.java
- src/test/java/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java 6 additions, 6 deletions...a/at/ac/uibk/gitsearch/web/rest/StatisticsResourceIT.java
Please register or sign in to comment