Merge branch 'master' into w2p-67478_Search-external-sources-in-submission
Conflicts: src/app/core/data/data.service.ts src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
Showing
- config/environment.default.js 5 additions, 4 deletionsconfig/environment.default.js
- package.json 57 additions, 50 deletionspackage.json
- resources/i18n/en.json5 83 additions, 1 deletionresources/i18n/en.json5
- src/app/+admin/admin-registries/metadata-registry/metadata-registry.component.spec.ts 4 additions, 4 deletions...ies/metadata-registry/metadata-registry.component.spec.ts
- src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.spec.ts 4 additions, 4 deletions...istries/metadata-schema/metadata-schema.component.spec.ts
- src/app/+collection-page/collection-form/collection-form.component.ts 25 additions, 4 deletions...lection-page/collection-form/collection-form.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 7 additions, 5 deletionssrc/app/+collection-page/collection-page.component.html
- src/app/+collection-page/collection-page.module.ts 3 additions, 2 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
- src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts 42 additions, 0 deletions...collection-metadata/collection-metadata.component.spec.ts
- src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts 29 additions, 0 deletions...page/collection-metadata/collection-metadata.component.ts
- src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.html 0 additions, 0 deletions...ion-page/collection-roles/collection-roles.component.html
- src/app/+collection-page/edit-collection-page/collection-roles/collection-roles.component.ts 12 additions, 0 deletions...ction-page/collection-roles/collection-roles.component.ts
- src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.html 0 additions, 0 deletions...n-page/collection-source/collection-source.component.html
Please register or sign in to comment