Merge branch 'master' into w2p-66156_Display-of-relations
Conflicts: src/app/+search-page/filtered-search-page.component.ts src/app/+search-page/search-page.module.ts
Showing
- README.md 44 additions, 53 deletionsREADME.md
- config/environment.default.js 4 additions, 0 deletionsconfig/environment.default.js
- resources/i18n/cs.json5 6 additions, 6 deletionsresources/i18n/cs.json5
- resources/i18n/de.json5 3 additions, 3 deletionsresources/i18n/de.json5
- resources/i18n/en.json5 3 additions, 3 deletionsresources/i18n/en.json5
- resources/i18n/es.json5 3 additions, 3 deletionsresources/i18n/es.json5
- resources/i18n/nl.json5 6 additions, 6 deletionsresources/i18n/nl.json5
- resources/i18n/pt.json5 737 additions, 1500 deletionsresources/i18n/pt.json5
- src/app/+my-dspace-page/my-dspace-page.component.spec.ts 2 additions, 2 deletionssrc/app/+my-dspace-page/my-dspace-page.component.spec.ts
- src/app/+my-dspace-page/my-dspace-page.component.ts 2 additions, 2 deletionssrc/app/+my-dspace-page/my-dspace-page.component.ts
- src/app/+search-page/configuration-search-page.component.ts 2 additions, 2 deletionssrc/app/+search-page/configuration-search-page.component.ts
- src/app/+search-page/search-filters/search-filter/search-filter.component.html 16 additions, 5 deletions...search-filters/search-filter/search-filter.component.html
- src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts 1 addition, 1 deletion...earch-filters/search-filter/search-filter.service.spec.ts
- src/app/+search-page/search-page.component.html 48 additions, 41 deletionssrc/app/+search-page/search-page.component.html
- src/app/+search-page/search-page.component.scss 4 additions, 46 deletionssrc/app/+search-page/search-page.component.scss
- src/app/+search-page/search-page.component.spec.ts 2 additions, 32 deletionssrc/app/+search-page/search-page.component.spec.ts
- src/app/+search-page/search-page.component.ts 2 additions, 2 deletionssrc/app/+search-page/search-page.component.ts
- src/app/+search-page/search-page.module.ts 7 additions, 5 deletionssrc/app/+search-page/search-page.module.ts
- src/app/+search-page/search-settings/search-settings.component.html 30 additions, 22 deletions...earch-page/search-settings/search-settings.component.html
- src/app/+search-page/search-settings/search-settings.component.spec.ts 77 additions, 65 deletions...ch-page/search-settings/search-settings.component.spec.ts
Please register or sign in to comment