Merge remote-tracking branch 'remotes/origin/master' into upgrade-angular-7
# Conflicts: # src/app/core/services/route.service.ts # src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts # src/app/shared/form/builder/form-builder.service.ts # src/app/shared/object-list/object-list.component.spec.ts # src/app/submission/submission.service.ts
Showing
- karma.conf.js 5 additions, 1 deletionkarma.conf.js
- package.json 1 addition, 0 deletionspackage.json
- resources/i18n/en.json5 76 additions, 3 deletionsresources/i18n/en.json5
- 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-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.component.ts 2 additions, 2 deletionssrc/app/+collection-page/collection-page.component.ts
- src/app/+collection-page/collection-page.module.ts 1 addition, 3 deletionssrc/app/+collection-page/collection-page.module.ts
- src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts 4 additions, 6 deletions...ollection-mapper/item-collection-mapper.component.spec.ts
- src/app/+item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts 3 additions, 3 deletions...tem-collection-mapper/item-collection-mapper.component.ts
- src/app/+item-page/edit-item-page/item-move/item-move.component.spec.ts 1 addition, 1 deletion...page/edit-item-page/item-move/item-move.component.spec.ts
- src/app/+item-page/edit-item-page/item-move/item-move.component.ts 3 additions, 5 deletions...item-page/edit-item-page/item-move/item-move.component.ts
- src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts 3 additions, 1 deletion...e/item-relationships/item-relationships.component.spec.ts
- src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts 5 additions, 5 deletions...m-page/item-relationships/item-relationships.component.ts
- src/app/+item-page/item-page.module.ts 3 additions, 1 deletionsrc/app/+item-page/item-page.module.ts
- src/app/+item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts 73 additions, 0 deletions...t-incremental-list/abstract-incremental-list.component.ts
- src/app/+item-page/simple/item-types/publication/publication.component.spec.ts 3 additions, 9 deletions...mple/item-types/publication/publication.component.spec.ts
- src/app/+item-page/simple/item-types/publication/publication.component.ts 2 additions, 2 deletions...ge/simple/item-types/publication/publication.component.ts
- src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts 4 additions, 50 deletions...page/simple/item-types/shared/item-relationships-utils.ts
- src/app/+item-page/simple/item-types/shared/item.component.spec.ts 3 additions, 9 deletions...item-page/simple/item-types/shared/item.component.spec.ts
Please register or sign in to comment