Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete
Showing
- e2e/app.po.ts 2 additions, 1 deletione2e/app.po.ts
- karma.conf.js 5 additions, 1 deletionkarma.conf.js
- package.json 3 additions, 1 deletionpackage.json
- resources/fonts/README.md 3 additions, 0 deletionsresources/fonts/README.md
- resources/i18n/en.json5 177 additions, 4 deletionsresources/i18n/en.json5
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts 3 additions, 3 deletions...gistries/bitstream-formats/bitstream-formats.component.ts
- src/app/+admin/admin-sidebar/admin-sidebar.component.ts 0 additions, 1 deletionsrc/app/+admin/admin-sidebar/admin-sidebar.component.ts
- src/app/+collection-page/collection-form/collection-form.component.ts 20 additions, 3 deletions...lection-page/collection-form/collection-form.component.ts
- src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts 5 additions, 11 deletions...tion-item-mapper/collection-item-mapper.component.spec.ts
- src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts 4 additions, 4 deletions...ollection-item-mapper/collection-item-mapper.component.ts
- src/app/+collection-page/collection-page-routing.module.ts 2 additions, 7 deletionssrc/app/+collection-page/collection-page-routing.module.ts
- src/app/+collection-page/collection-page.component.html 8 additions, 5 deletionssrc/app/+collection-page/collection-page.component.html
- src/app/+collection-page/collection-page.component.ts 2 additions, 2 deletionssrc/app/+collection-page/collection-page.component.ts
- src/app/+collection-page/collection-page.module.ts 7 additions, 6 deletionssrc/app/+collection-page/collection-page.module.ts
- src/app/+collection-page/create-collection-page/create-collection-page.component.html 1 addition, 1 deletion...ate-collection-page/create-collection-page.component.html
- src/app/+collection-page/create-collection-page/create-collection-page.component.spec.ts 3 additions, 0 deletions...-collection-page/create-collection-page.component.spec.ts
- src/app/+collection-page/create-collection-page/create-collection-page.component.ts 7 additions, 2 deletions...reate-collection-page/create-collection-page.component.ts
- src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.html 0 additions, 0 deletions...n-page/collection-curate/collection-curate.component.html
- src/app/+collection-page/edit-collection-page/collection-curate/collection-curate.component.ts 12 additions, 0 deletions...ion-page/collection-curate/collection-curate.component.ts
- src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html 6 additions, 0 deletions...ge/collection-metadata/collection-metadata.component.html
Please register or sign in to comment