Merge branch 'master' into selectable-themes
Conflicts: src/app/core/core.effects.ts
Showing
- .travis.yml 0 additions, 3 deletions.travis.yml
- package.json 1 addition, 1 deletionpackage.json
- resources/i18n/en.json 30 additions, 18 deletionsresources/i18n/en.json
- src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts 1 addition, 0 deletions...item-page/edit-item-page/edit-item-page.routing.module.ts
- src/app/+item-page/item-page.module.ts 12 additions, 19 deletionssrc/app/+item-page/item-page.module.ts
- src/app/+search-page/filtered-search-page.component.spec.ts 0 additions, 16 deletionssrc/app/+search-page/filtered-search-page.component.spec.ts
- src/app/+search-page/filtered-search-page.component.ts 22 additions, 7 deletionssrc/app/+search-page/filtered-search-page.component.ts
- src/app/+search-page/filtered-search-page.guard.ts 3 additions, 5 deletionssrc/app/+search-page/filtered-search-page.guard.ts
- src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.spec.ts 1 addition, 2 deletions...filters/search-filter/search-fixed-filter.service.spec.ts
- src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.ts 8 additions, 7 deletions...arch-filters/search-filter/search-fixed-filter.service.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 1 addition, 1 deletionsrc/app/+search-page/search-page.component.html
- src/app/+search-page/search-page.component.ts 3 additions, 4 deletionssrc/app/+search-page/search-page.component.ts
- src/app/+search-page/search-results/search-results.component.html 1 addition, 1 deletion...+search-page/search-results/search-results.component.html
- src/app/+search-page/search-results/search-results.component.ts 4 additions, 2 deletions...p/+search-page/search-results/search-results.component.ts
- src/app/+search-page/search-service/search-configuration.service.spec.ts 0 additions, 16 deletions...-page/search-service/search-configuration.service.spec.ts
- src/app/+search-page/search-service/search-configuration.service.ts 4 additions, 20 deletions...earch-page/search-service/search-configuration.service.ts
- src/app/+search-page/search-settings/search-settings.component.html 1 addition, 0 deletions...earch-page/search-settings/search-settings.component.html
- src/app/+search-page/search-sidebar/search-sidebar.component.html 1 addition, 1 deletion...+search-page/search-sidebar/search-sidebar.component.html
- src/app/+search-page/search-switch-configuration/search-switch-configuration.component.spec.ts 1 addition, 1 deletion...nfiguration/search-switch-configuration.component.spec.ts
Please register or sign in to comment