Merge branch 'development' into improvement/adapt-import-to-new-artemis-export
# Conflicts: # src/main/java/at/ac/uibk/gitsearch/es/model/ArtemisExerciseInfo.java # src/main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java # src/main/webapp/app/exercise/import/exercise-import.component.html # src/main/webapp/app/exercise/import/exercise-import.component.ts # src/main/webapp/app/shared/model/artemis-exercise-info.model.ts # src/main/webapp/app/shared/model/exercise.model.ts
Branches
Tags
Showing
- .classpath 1355 additions, 13 deletions.classpath
- .project 7 additions, 11 deletions.project
- .settings/org.eclipse.jdt.core.prefs 1 addition, 1 deletion.settings/org.eclipse.jdt.core.prefs
- .settings/org.eclipse.m2e.core.prefs 1 addition, 1 deletion.settings/org.eclipse.m2e.core.prefs
- package-lock.json 22 additions, 29677 deletionspackage-lock.json
- pom.xml 2 additions, 3 deletionspom.xml
- src/main/java/at/ac/uibk/gitsearch/es/model/ArtemisExerciseInfo.java 105 additions, 72 deletions...va/at/ac/uibk/gitsearch/es/model/ArtemisExerciseInfo.java
- src/main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java 313 additions, 176 deletions...main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/MetaDataRepository.java 30 additions, 29 deletions.../uibk/gitsearch/repository/search/MetaDataRepository.java
- src/main/java/at/ac/uibk/gitsearch/repository/search/SearchRepositoryConstants.java 2 additions, 2 deletions...itsearch/repository/search/SearchRepositoryConstants.java
- src/main/java/at/ac/uibk/gitsearch/service/SearchService.java 5 additions, 4 deletions...main/java/at/ac/uibk/gitsearch/service/SearchService.java
- src/main/java/at/ac/uibk/gitsearch/service/dto/LikesCriteria.java 0 additions, 11 deletions.../java/at/ac/uibk/gitsearch/service/dto/LikesCriteria.java
- src/main/java/at/ac/uibk/gitsearch/web/rest/SearchResource.java 3 additions, 2 deletions...in/java/at/ac/uibk/gitsearch/web/rest/SearchResource.java
- src/main/webapp/app/bookmarks/bookmarks.component.ts 2 additions, 37 deletionssrc/main/webapp/app/bookmarks/bookmarks.component.ts
- src/main/webapp/app/exercise/exercise-details/exercise-details.component.html 4 additions, 4 deletions...exercise/exercise-details/exercise-details.component.html
- src/main/webapp/app/exercise/exercise-details/exercise-details.component.ts 11 additions, 5 deletions...p/exercise/exercise-details/exercise-details.component.ts
- src/main/webapp/app/exercise/exercise-details/exercise-metadata/exercise-metadata.component.html 59 additions, 11 deletions...etails/exercise-metadata/exercise-metadata.component.html
- src/main/webapp/app/exercise/import/exercise-import.component.ts 0 additions, 1 deletion...n/webapp/app/exercise/import/exercise-import.component.ts
- src/main/webapp/app/search/search-input/search-input.component.html 3 additions, 18 deletions...ebapp/app/search/search-input/search-input.component.html
- src/main/webapp/app/search/search-input/search-input.component.ts 1 addition, 19 deletions.../webapp/app/search/search-input/search-input.component.ts
Please register or sign in to comment