Merge branch 'development' into tests/#51-import-from-artemis
# Conflicts: # src/main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java
Showing
- Jenkinsfile 2 additions, 2 deletionsJenkinsfile
- src/main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java 101 additions, 12 deletions...main/java/at/ac/uibk/gitsearch/es/model/ExerciseInfo.java
- src/main/webapp/app/app-routing.module.ts 31 additions, 49 deletionssrc/main/webapp/app/app-routing.module.ts
- src/main/webapp/app/editorialPages/editorialPages.module.ts 48 additions, 48 deletionssrc/main/webapp/app/editorialPages/editorialPages.module.ts
- src/main/webapp/app/editorialPages/pages.route.ts 18 additions, 5 deletionssrc/main/webapp/app/editorialPages/pages.route.ts
- src/main/webapp/app/search/search-input/search-input.component.ts 3 additions, 6 deletions.../webapp/app/search/search-input/search-input.component.ts
- src/main/webapp/app/teaserContent/teaserContent.component.ts 22 additions, 15 deletionssrc/main/webapp/app/teaserContent/teaserContent.component.ts
- src/test/java/at/ac/uibk/gitsearch/es/model/ExerciseInfoTest.java 27 additions, 0 deletions.../java/at/ac/uibk/gitsearch/es/model/ExerciseInfoTest.java
- src/test/java/at/ac/uibk/gitsearch/service/dto/VariousDTOTest.java 18 additions, 0 deletions...java/at/ac/uibk/gitsearch/service/dto/VariousDTOTest.java
- src/test/javascript/spec/app/editorialPages/pages.component.spec.ts 156 additions, 0 deletions...avascript/spec/app/editorialPages/pages.component.spec.ts
- src/test/javascript/spec/app/teaserContent/teaserContent.component.spec.ts 72 additions, 0 deletions...pt/spec/app/teaserContent/teaserContent.component.spec.ts
- src/test/javascript/spec/helpers/mock-language.service.ts 6 additions, 1 deletionsrc/test/javascript/spec/helpers/mock-language.service.ts
- src/test/javascript/spec/helpers/mock-pages.service.ts 25 additions, 0 deletionssrc/test/javascript/spec/helpers/mock-pages.service.ts
- src/test/javascript/spec/helpers/mock-search.service.ts 40 additions, 0 deletionssrc/test/javascript/spec/helpers/mock-search.service.ts
- src/test/javascript/spec/test.module.ts 6 additions, 3 deletionssrc/test/javascript/spec/test.module.ts
Please register or sign in to comment