Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7
# Conflicts: # src/app/+collection-page/collection-form/collection-form.component.ts # src/app/+community-page/community-form/community-form.component.ts # src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
Showing
- resources/i18n/en.json5 83 additions, 1 deletionresources/i18n/en.json5
- src/app/+collection-page/collection-form/collection-form.component.ts 25 additions, 2 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
- src/app/+collection-page/edit-collection-page/collection-source/collection-source.component.ts 12 additions, 0 deletions...ion-page/collection-source/collection-source.component.ts
- src/app/+collection-page/edit-collection-page/edit-collection-page.component.html 0 additions, 11 deletions.../edit-collection-page/edit-collection-page.component.html
- src/app/+collection-page/edit-collection-page/edit-collection-page.component.scss 0 additions, 1 deletion.../edit-collection-page/edit-collection-page.component.scss
- src/app/+collection-page/edit-collection-page/edit-collection-page.component.spec.ts 20 additions, 4 deletions...it-collection-page/edit-collection-page.component.spec.ts
Please register or sign in to comment