Merge branch 'development' into '268-restore-gitsearch-integration-tests'
# Conflicts: # src/main/java/at/ac/uibk/gitsearch/service/mapper/SavedSearchesMapper.java
Branches
Showing
- .classpath 8 additions, 8 deletions.classpath
- .gitlab-ci.yml 1 addition, 1 deletion.gitlab-ci.yml
- .settings/org.eclipse.jdt.apt.core.prefs 2 additions, 2 deletions.settings/org.eclipse.jdt.apt.core.prefs
- package.json 1 addition, 0 deletionspackage.json
- src/main/java/at/ac/uibk/gitsearch/repository/search/UserSearchRepository.java 1 addition, 0 deletions...ibk/gitsearch/repository/search/UserSearchRepository.java
- src/main/java/at/ac/uibk/gitsearch/service/LikesService.java 3 additions, 7 deletionssrc/main/java/at/ac/uibk/gitsearch/service/LikesService.java
- src/main/java/at/ac/uibk/gitsearch/service/mapper/EntityMapper.java 3 additions, 6 deletions...ava/at/ac/uibk/gitsearch/service/mapper/EntityMapper.java
- src/main/java/at/ac/uibk/gitsearch/service/mapper/SavedSearchesMapper.java 0 additions, 2 deletions...ac/uibk/gitsearch/service/mapper/SavedSearchesMapper.java
- src/main/java/at/ac/uibk/gitsearch/service/mapper/UserMapper.java 1 addition, 5 deletions.../java/at/ac/uibk/gitsearch/service/mapper/UserMapper.java
- src/main/resources/config/application-staging.yml 8 additions, 8 deletionssrc/main/resources/config/application-staging.yml
- src/main/resources/config/liquibase/changelog/20210414150955_added_entity_SavedSearches.xml 0 additions, 21 deletions...e/changelog/20210414150955_added_entity_SavedSearches.xml
- src/main/webapp/app/account/account.module.ts 1 addition, 1 deletionsrc/main/webapp/app/account/account.module.ts
- src/main/webapp/app/account/account.route.ts 9 additions, 1 deletionsrc/main/webapp/app/account/account.route.ts
- src/main/webapp/app/account/achievements.component.html 218 additions, 220 deletionssrc/main/webapp/app/account/achievements.component.html
- src/main/webapp/app/account/achievements.component.ts 3 additions, 10 deletionssrc/main/webapp/app/account/achievements.component.ts
- src/main/webapp/app/account/settings/settings.component.html 7 additions, 4 deletionssrc/main/webapp/app/account/settings/settings.component.html
- src/main/webapp/app/app.constants.ts 13 additions, 0 deletionssrc/main/webapp/app/app.constants.ts
- src/main/webapp/app/app.module.ts 0 additions, 1 deletionsrc/main/webapp/app/app.module.ts
- src/main/webapp/app/entities/entity-routing.module.ts 18 additions, 1 deletionsrc/main/webapp/app/entities/entity-routing.module.ts
- src/main/webapp/app/entities/likes/likes.component.html 71 additions, 69 deletionssrc/main/webapp/app/entities/likes/likes.component.html
Please register or sign in to comment