resolved merge conflicts
Branches
Showing
- .classpath 6 additions, 3 deletions.classpath
- .gitlab-ci.yml 17 additions, 18 deletions.gitlab-ci.yml
- .jhipster/Likes.json 11 additions, 10 deletions.jhipster/Likes.json
- .jhipster/SavedSearches.json 25 additions, 23 deletions.jhipster/SavedSearches.json
- .jhipster/Statistics.json 11 additions, 10 deletions.jhipster/Statistics.json
- .jhipster/UserWatchList.json 23 additions, 22 deletions.jhipster/UserWatchList.json
- .jhipster/WatchListEntry.json 21 additions, 20 deletions.jhipster/WatchListEntry.json
- .yo-rc.json 1 addition, 0 deletions.yo-rc.json
- gitsearch.jdl 13 additions, 0 deletionsgitsearch.jdl
- pom.xml 96 additions, 0 deletionspom.xml
- saved_searches.csv 0 additions, 0 deletionssaved_searches.csv
- src/main/java/at/ac/uibk/gitsearch/config/CacheConfiguration.java 3 additions, 4 deletions.../java/at/ac/uibk/gitsearch/config/CacheConfiguration.java
- src/main/java/at/ac/uibk/gitsearch/domain/SavedSearches.java 28 additions, 18 deletionssrc/main/java/at/ac/uibk/gitsearch/domain/SavedSearches.java
- src/main/java/at/ac/uibk/gitsearch/repository/SavedSearchesRepository.java 2 additions, 5 deletions...ac/uibk/gitsearch/repository/SavedSearchesRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/SavedSearchesSearchRepository.java 42 additions, 2 deletions...arch/repository/search/SavedSearchesSearchRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/SortToFieldSortBuilderConverter.java 24 additions, 0 deletions...ch/repository/search/SortToFieldSortBuilderConverter.java
- src/main/java/at/ac/uibk/gitsearch/service/LikesService.java 4 additions, 27 deletionssrc/main/java/at/ac/uibk/gitsearch/service/LikesService.java
- src/main/java/at/ac/uibk/gitsearch/service/SavedSearchesService.java 51 additions, 26 deletions...va/at/ac/uibk/gitsearch/service/SavedSearchesService.java
- src/main/java/at/ac/uibk/gitsearch/service/dto/SavedSearchesDTO.java 17 additions, 28 deletions...va/at/ac/uibk/gitsearch/service/dto/SavedSearchesDTO.java
- src/main/java/at/ac/uibk/gitsearch/service/mapper/EntityMapper.java 37 additions, 4 deletions...ava/at/ac/uibk/gitsearch/service/mapper/EntityMapper.java
Please register or sign in to comment