There was an error fetching the commit references. Please try again later.
Merge branch 'development' into 'frontend_refactoring'
# Conflicts: # src/main/webapp/i18n/de/exercise.json # src/main/webapp/i18n/en/exercise.json
Showing
- .classpath 19 additions, 9 deletions.classpath
- .gitignore 1 addition, 0 deletions.gitignore
- .project 11 additions, 0 deletions.project
- .settings/org.eclipse.jdt.apt.core.prefs 4 additions, 0 deletions.settings/org.eclipse.jdt.apt.core.prefs
- .settings/org.eclipse.jdt.core.prefs 1 addition, 0 deletions.settings/org.eclipse.jdt.core.prefs
- src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java 6 additions, 3 deletions...main/java/at/ac/uibk/gitsearch/service/GitlabService.java
- src/main/java/at/ac/uibk/gitsearch/service/SearchService.java 1 addition, 1 deletion...main/java/at/ac/uibk/gitsearch/service/SearchService.java
- src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java 1 addition, 1 deletion...ava/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java
- src/main/resources/config/application-prod.yml 3 additions, 4 deletionssrc/main/resources/config/application-prod.yml
- src/main/webapp/app/admin/health/health.component.ts 3 additions, 3 deletionssrc/main/webapp/app/admin/health/health.component.ts
- src/main/webapp/app/app.module.ts 3 additions, 12 deletionssrc/main/webapp/app/app.module.ts
- src/main/webapp/app/core/application/applicationInfo.service.ts 14 additions, 19 deletions...in/webapp/app/core/application/applicationInfo.service.ts
- src/main/webapp/app/exercise/exercise-card/exercise-card.component.ts 1 addition, 1 deletion...app/app/exercise/exercise-card/exercise-card.component.ts
- src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts 17 additions, 20 deletions...p/exercise/exercise-details/exercise-details.component.ts
- src/main/webapp/app/layouts/main/main.component.ts 6 additions, 8 deletionssrc/main/webapp/app/layouts/main/main.component.ts
- src/main/webapp/app/search/search-input/search-input.component.ts 96 additions, 53 deletions.../webapp/app/search/search-input/search-input.component.ts
- src/main/webapp/app/search/search.component.ts 5 additions, 5 deletionssrc/main/webapp/app/search/search.component.ts
- src/main/webapp/app/search/service/search-service.ts 3 additions, 3 deletionssrc/main/webapp/app/search/service/search-service.ts
- src/main/webapp/app/shared/service/cache.service.ts 42 additions, 42 deletionssrc/main/webapp/app/shared/service/cache.service.ts
- src/main/webapp/app/shared/service/message-service.ts 41 additions, 52 deletionssrc/main/webapp/app/shared/service/message-service.ts
Please register or sign in to comment