Merge remote-tracking branch 'remotes/origin/master' into submission-miscellaneous-fixes
# Conflicts: # src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
Showing
- resources/i18n/en.json 41 additions, 9 deletionsresources/i18n/en.json
- src/app/+admin/admin-registries/admin-registries-routing.module.ts 19 additions, 4 deletions...admin/admin-registries/admin-registries-routing.module.ts
- src/app/+admin/admin-registries/admin-registries.module.ts 3 additions, 3 deletionssrc/app/+admin/admin-registries/admin-registries.module.ts
- src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.html 11 additions, 0 deletions.../add-bitstream-format/add-bitstream-format.component.html
- src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts 106 additions, 0 deletions...d-bitstream-format/add-bitstream-format.component.spec.ts
- src/app/+admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts 49 additions, 0 deletions...ts/add-bitstream-format/add-bitstream-format.component.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-format.actions.ts 64 additions, 0 deletions...-registries/bitstream-formats/bitstream-format.actions.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts 83 additions, 0 deletions...tries/bitstream-formats/bitstream-format.reducers.spec.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts 55 additions, 0 deletions...registries/bitstream-formats/bitstream-format.reducers.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts 37 additions, 0 deletions...ies/bitstream-formats/bitstream-formats-routing.module.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.html 25 additions, 10 deletions...stries/bitstream-formats/bitstream-formats.component.html
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts 249 additions, 58 deletions...ies/bitstream-formats/bitstream-formats.component.spec.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.ts 132 additions, 13 deletions...gistries/bitstream-formats/bitstream-formats.component.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.module.ts 30 additions, 0 deletions...-registries/bitstream-formats/bitstream-formats.module.ts
- src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts 31 additions, 0 deletions...egistries/bitstream-formats/bitstream-formats.resolver.ts
- src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.html 11 additions, 0 deletions...dit-bitstream-format/edit-bitstream-format.component.html
- src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts 123 additions, 0 deletions...-bitstream-format/edit-bitstream-format.component.spec.ts
- src/app/+admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts 62 additions, 0 deletions.../edit-bitstream-format/edit-bitstream-format.component.ts
- src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.html 3 additions, 0 deletions.../bitstream-formats/format-form/format-form.component.html
- src/app/+admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts 104 additions, 0 deletions...tstream-formats/format-form/format-form.component.spec.ts
Please register or sign in to comment