Merge branch 'master' into w2p-62589_Item-mapper-update
Conflicts: resources/i18n/en.json5
Showing
- .travis.yml 5 additions, 3 deletions.travis.yml
- package.json 5 additions, 0 deletionspackage.json
- resources/i18n/cs.json5 32 additions, 5 deletionsresources/i18n/cs.json5
- resources/i18n/de.json5 28 additions, 2 deletionsresources/i18n/de.json5
- resources/i18n/en.json5 82 additions, 6 deletionsresources/i18n/en.json5
- resources/i18n/nl.json5 28 additions, 2 deletionsresources/i18n/nl.json5
- src/app/+my-dspace-page/my-dspace-page.component.spec.ts 0 additions, 3 deletionssrc/app/+my-dspace-page/my-dspace-page.component.spec.ts
- src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts 1 addition, 19 deletions...earch-filters/search-filter/search-filter.service.spec.ts
- src/app/+search-page/search-filters/search-filter/search-filter.service.ts 0 additions, 9 deletions...age/search-filters/search-filter/search-filter.service.ts
- src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.spec.ts 1 addition, 21 deletions...filters/search-filter/search-fixed-filter.service.spec.ts
- src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.ts 0 additions, 51 deletions...arch-filters/search-filter/search-fixed-filter.service.ts
- src/app/+search-page/search-page.component.spec.ts 1 addition, 5 deletionssrc/app/+search-page/search-page.component.spec.ts
- src/app/+search-page/search-service/search-configuration.service.spec.ts 0 additions, 8 deletions...-page/search-service/search-configuration.service.spec.ts
- src/app/+search-page/search-service/search-configuration.service.ts 0 additions, 23 deletions...earch-page/search-service/search-configuration.service.ts
- src/app/shared/uploader/uploader.component.html 1 addition, 1 deletionsrc/app/shared/uploader/uploader.component.html
- src/modules/app/browser-app.module.ts 2 additions, 2 deletionssrc/modules/app/browser-app.module.ts
- src/modules/app/server-app.module.ts 2 additions, 2 deletionssrc/modules/app/server-app.module.ts
- src/ngx-translate-loaders/translate-json5-http.loader.ts 15 additions, 0 deletionssrc/ngx-translate-loaders/translate-json5-http.loader.ts
- src/ngx-translate-loaders/translate-json5-universal.loader.ts 3 additions, 2 deletions...ngx-translate-loaders/translate-json5-universal.loader.ts
- yarn.lock 29 additions, 30 deletionsyarn.lock
Please register or sign in to comment