Merge branch 'development' into improvement/adapt-import-to-new-artemis-export
# Conflicts: # src/main/webapp/i18n/de/exercise.json # src/main/webapp/i18n/en/exercise.json
Branches
Showing
- .classpath 9 additions, 1351 deletions.classpath
- src/main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java 1 addition, 3 deletions...main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java
- src/main/java/at/ac/uibk/gitsearch/service/GitlabService.java 3 additions, 3 deletions...main/java/at/ac/uibk/gitsearch/service/GitlabService.java
- src/main/webapp/i18n/de/exercise.json 4 additions, 5 deletionssrc/main/webapp/i18n/de/exercise.json
- src/main/webapp/i18n/en/exercise.json 4 additions, 5 deletionssrc/main/webapp/i18n/en/exercise.json
- src/test/java/at/ac/uibk/gitsearch/repository/gitlab/TestMetaDataGenerator.java 59 additions, 38 deletions...bk/gitsearch/repository/gitlab/TestMetaDataGenerator.java
- src/test/java/at/ac/uibk/gitsearch/repository/gitlab/testProject1/UMLModelling.png 0 additions, 0 deletions...gitsearch/repository/gitlab/testProject1/UMLModelling.png
- src/test/java/at/ac/uibk/gitsearch/repository/gitlab/testProject1/metadata.yaml 21 additions, 0 deletions...bk/gitsearch/repository/gitlab/testProject1/metadata.yaml
- src/test/java/at/ac/uibk/gitsearch/service/GitLabServiceIT.java 1 addition, 1 deletion...st/java/at/ac/uibk/gitsearch/service/GitLabServiceIT.java
- src/test/java/at/ac/uibk/gitsearch/service/PluginManagerActionIT.java 1 addition, 1 deletion...a/at/ac/uibk/gitsearch/service/PluginManagerActionIT.java
- src/test/java/at/ac/uibk/gitsearch/web/rest/ExerciseResourceIT.java 10 additions, 10 deletions...ava/at/ac/uibk/gitsearch/web/rest/ExerciseResourceIT.java
- src/test/java/at/ac/uibk/gitsearch/web/rest/SearchResourceIT.java 1 addition, 1 deletion.../java/at/ac/uibk/gitsearch/web/rest/SearchResourceIT.java
- src/test/resources/at/ac/uibk/gitsearch/repository/search/testData/es_metadata.schema.json 32 additions, 11 deletions...search/repository/search/testData/es_metadata.schema.json
- src/test/resources/at/ac/uibk/gitsearch/service/testData/metaData/1/metaData.yaml 3 additions, 10 deletions.../uibk/gitsearch/service/testData/metaData/1/metaData.yaml
- src/test/resources/at/ac/uibk/gitsearch/service/testData/metaData/143/metaData.yaml 2 additions, 5 deletions...ibk/gitsearch/service/testData/metaData/143/metaData.yaml
- src/test/resources/at/ac/uibk/gitsearch/service/testData/metaData/2/metaData.yaml 2 additions, 5 deletions.../uibk/gitsearch/service/testData/metaData/2/metaData.yaml
- src/test/resources/at/ac/uibk/gitsearch/service/testData/metaData/272/metaData.yaml 2 additions, 4 deletions...ibk/gitsearch/service/testData/metaData/272/metaData.yaml
- src/test/resources/at/ac/uibk/gitsearch/service/testData/metaData/272/solution/src/at/metaData.yaml 3 additions, 10 deletions...rvice/testData/metaData/272/solution/src/at/metaData.yaml
- src/test/resources/at/ac/uibk/gitsearch/service/testData/metaData/3/metaData.yaml 1 addition, 9 deletions.../uibk/gitsearch/service/testData/metaData/3/metaData.yaml
- src/test/resources/at/ac/uibk/gitsearch/service/testData/metaData/3/solution/src/at/metaData.yaml 2 additions, 9 deletions...service/testData/metaData/3/solution/src/at/metaData.yaml
Please register or sign in to comment