Merge branch 'master' into w2p-44988_search-sidebar
Conflicts: resources/i18n/en.json src/app/+search-page/search-page.component.html
Showing
- e2e/app.e2e-spec.ts 2 additions, 2 deletionse2e/app.e2e-spec.ts
- karma.conf.js 21 additions, 12 deletionskarma.conf.js
- package.json 25 additions, 25 deletionspackage.json
- resources/i18n/en.json 8 additions, 0 deletionsresources/i18n/en.json
- spec-bundle.js 6 additions, 20 deletionsspec-bundle.js
- src/app/+collection-page/collection-page-routing.module.ts 3 additions, 1 deletionsrc/app/+collection-page/collection-page-routing.module.ts
- src/app/+collection-page/collection-page.component.ts 12 additions, 6 deletionssrc/app/+collection-page/collection-page.component.ts
- src/app/+community-page/community-page-routing.module.ts 3 additions, 1 deletionsrc/app/+community-page/community-page-routing.module.ts
- src/app/+community-page/community-page.component.ts 6 additions, 5 deletionssrc/app/+community-page/community-page.component.ts
- src/app/+home-page/home-page-routing.module.ts 1 addition, 1 deletionsrc/app/+home-page/home-page-routing.module.ts
- src/app/+item-page/full/full-item-page.component.ts 6 additions, 4 deletionssrc/app/+item-page/full/full-item-page.component.ts
- src/app/+item-page/simple/item-page.component.ts 8 additions, 1 deletionsrc/app/+item-page/simple/item-page.component.ts
- src/app/+search-page/search-options.model.ts 6 additions, 0 deletionssrc/app/+search-page/search-options.model.ts
- src/app/+search-page/search-page-routing.module.ts 1 addition, 1 deletionsrc/app/+search-page/search-page-routing.module.ts
- src/app/+search-page/search-page.component.html 5 additions, 1 deletionsrc/app/+search-page/search-page.component.html
- src/app/+search-page/search-page.component.spec.ts 1 addition, 1 deletionsrc/app/+search-page/search-page.component.spec.ts
- src/app/+search-page/search-page.component.ts 1 addition, 0 deletionssrc/app/+search-page/search-page.component.ts
- src/app/+search-page/search-service/search.service.spec.ts 56 additions, 0 deletionssrc/app/+search-page/search-service/search.service.spec.ts
- src/app/+search-page/search-service/search.service.ts 25 additions, 1 deletionsrc/app/+search-page/search-service/search.service.ts
- src/app/app.component.spec.ts 6 additions, 2 deletionssrc/app/app.component.spec.ts
Please register or sign in to comment