Merge remote-tracking branch 'origin/feature/#51-import-from-artemis'
into development and additional clean up Conflicts: src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java src/main/webapp/app/app-routing.module.ts src/main/webapp/app/exercise/service/exercise.service.ts src/main/webapp/app/search/search-input/search-input.component.ts src/main/webapp/app/shared/model/exercise.model.ts
Showing
- .classpath 0 additions, 6 deletions.classpath
- package-lock.json 29714 additions, 30 deletionspackage-lock.json
- package.json 3 additions, 0 deletionspackage.json
- pom.xml 25 additions, 4 deletionspom.xml
- src/main/java/at/ac/uibk/gitsearch/es/model/ArtemisExerciseInfo.java 123 additions, 0 deletions...va/at/ac/uibk/gitsearch/es/model/ArtemisExerciseInfo.java
- src/main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java 219 additions, 0 deletions...main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java
- src/main/java/at/ac/uibk/gitsearch/service/AchievementService.java 2 additions, 4 deletions...java/at/ac/uibk/gitsearch/service/AchievementService.java
- src/main/java/at/ac/uibk/gitsearch/service/ArtemisImportError.java 14 additions, 0 deletions...java/at/ac/uibk/gitsearch/service/ArtemisImportError.java
- src/main/java/at/ac/uibk/gitsearch/service/ExerciseService.java 188 additions, 0 deletions...in/java/at/ac/uibk/gitsearch/service/ExerciseService.java
- src/main/java/at/ac/uibk/gitsearch/service/FileService.java 58 additions, 0 deletionssrc/main/java/at/ac/uibk/gitsearch/service/FileService.java
- src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java 187 additions, 2 deletions...main/java/at/ac/uibk/gitsearch/service/GitlabService.java
- src/main/java/at/ac/uibk/gitsearch/service/LikesQueryService.java 1 addition, 5 deletions.../java/at/ac/uibk/gitsearch/service/LikesQueryService.java
- src/main/java/at/ac/uibk/gitsearch/service/dto/MetadataUserDTO.java 64 additions, 0 deletions...ava/at/ac/uibk/gitsearch/service/dto/MetadataUserDTO.java
- src/main/java/at/ac/uibk/gitsearch/web/rest/EditorialPagesResource.java 0 additions, 2 deletions...at/ac/uibk/gitsearch/web/rest/EditorialPagesResource.java
- src/main/java/at/ac/uibk/gitsearch/web/rest/ExerciseResource.java 105 additions, 8 deletions.../java/at/ac/uibk/gitsearch/web/rest/ExerciseResource.java
- src/main/java/at/ac/uibk/gitsearch/web/rest/GitlabResource.java 55 additions, 0 deletions...in/java/at/ac/uibk/gitsearch/web/rest/GitlabResource.java
- src/main/java/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java 1 addition, 6 deletions...ava/at/ac/uibk/gitsearch/web/rest/StatisticsResource.java
- src/main/webapp/app/app-routing.module.ts 4 additions, 0 deletionssrc/main/webapp/app/app-routing.module.ts
- src/main/webapp/app/app.module.ts 4 additions, 0 deletionssrc/main/webapp/app/app.module.ts
- src/main/webapp/app/bookmarks/bookmarks.component.ts 3 additions, 3 deletionssrc/main/webapp/app/bookmarks/bookmarks.component.ts
Please register or sign in to comment