Merge branch 'master' into w2p-62339_Relationships-link-to-item-via-HAL-links
Conflicts: src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts src/app/+item-page/simple/item-types/shared/item.component.ts
Showing
- README.md 2 additions, 2 deletionsREADME.md
- config/environment.default.js 2 additions, 2 deletionsconfig/environment.default.js
- package.json 5 additions, 5 deletionspackage.json
- resources/i18n/en.json 129 additions, 4 deletionsresources/i18n/en.json
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts 18 additions, 0 deletions...gistries/bitstream-formats/bitstream-formats.component.ts
- src/app/+admin/admin-registries/metadata-registry/metadata-registry.actions.ts 23 additions, 4 deletions...registries/metadata-registry/metadata-registry.actions.ts
- src/app/+admin/admin-registries/metadata-registry/metadata-registry.effects.ts 0 additions, 35 deletions...registries/metadata-registry/metadata-registry.effects.ts
- src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts 183 additions, 0 deletions...ries/metadata-registry/metadata-registry.reducers.spec.ts
- src/app/+admin/admin-registries/metadata-registry/metadata-registry.reducers.ts 2 additions, 2 deletions...egistries/metadata-registry/metadata-registry.reducers.ts
- src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.spec.ts 6 additions, 0 deletions...metadata-field-form/metadata-field-form.component.spec.ts
- src/app/+admin/admin-registries/metadata-schema/metadata-field-form/metadata-field-form.component.ts 0 additions, 2 deletions...hema/metadata-field-form/metadata-field-form.component.ts
- src/app/+admin/admin-sidebar/admin-sidebar.component.ts 25 additions, 20 deletionssrc/app/+admin/admin-sidebar/admin-sidebar.component.ts
- src/app/+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component.ts 1 addition, 1 deletion...bar-section/expandable-admin-sidebar-section.component.ts
- src/app/+browse-by/+browse-by-date-page/browse-by-date-page.component.ts 0 additions, 1 deletion...-by/+browse-by-date-page/browse-by-date-page.component.ts
- src/app/+browse-by/browse-by-guard.spec.ts 125 additions, 0 deletionssrc/app/+browse-by/browse-by-guard.spec.ts
- src/app/+browse-by/browse-by-guard.ts 9 additions, 15 deletionssrc/app/+browse-by/browse-by-guard.ts
- src/app/+collection-page/collection-page.component.html 59 additions, 55 deletionssrc/app/+collection-page/collection-page.component.html
- src/app/+collection-page/collection-page.component.ts 59 additions, 61 deletionssrc/app/+collection-page/collection-page.component.ts
- src/app/+collection-page/collection-page.resolver.spec.ts 28 additions, 0 deletionssrc/app/+collection-page/collection-page.resolver.spec.ts
- src/app/+collection-page/collection-page.resolver.ts 5 additions, 3 deletionssrc/app/+collection-page/collection-page.resolver.ts
Please register or sign in to comment