Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates
Conflicts: src/app/+item-page/edit-item-page/edit-item-page.module.ts src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts src/app/core/core.module.ts src/app/core/data/data.service.ts src/app/core/data/object-updates/object-updates.actions.ts src/app/core/data/object-updates/object-updates.reducer.spec.ts src/app/core/data/object-updates/object-updates.reducer.ts src/app/core/data/object-updates/object-updates.service.spec.ts src/app/core/data/object-updates/object-updates.service.ts
Showing
- .travis.yml 5 additions, 0 deletions.travis.yml
- e2e/app.e2e-spec.ts 2 additions, 2 deletionse2e/app.e2e-spec.ts
- e2e/app.po.ts 1 addition, 1 deletione2e/app.po.ts
- e2e/search-page/search-page.e2e-spec.ts 21 additions, 18 deletionse2e/search-page/search-page.e2e-spec.ts
- resources/i18n/en.json5 10 additions, 1 deletionresources/i18n/en.json5
- src/app/+item-page/edit-item-page/edit-item-page.module.ts 3 additions, 1 deletionsrc/app/+item-page/edit-item-page/edit-item-page.module.ts
- src/app/+item-page/edit-item-page/item-delete/item-delete.component.html 98 additions, 0 deletions...age/edit-item-page/item-delete/item-delete.component.html
- src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts 151 additions, 22 deletions.../edit-item-page/item-delete/item-delete.component.spec.ts
- src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts 307 additions, 13 deletions...-page/edit-item-page/item-delete/item-delete.component.ts
- src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html 13 additions, 13 deletions...t-relationship-list/edit-relationship-list.component.html
- src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.spec.ts 85 additions, 51 deletions...elationship-list/edit-relationship-list.component.spec.ts
- src/app/+item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.ts 62 additions, 46 deletions...dit-relationship-list/edit-relationship-list.component.ts
- src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html 14 additions, 3 deletions...nships/edit-relationship/edit-relationship.component.html
- src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts 56 additions, 32 deletions...ips/edit-relationship/edit-relationship.component.spec.ts
- src/app/+item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.ts 86 additions, 11 deletions...ionships/edit-relationship/edit-relationship.component.ts
- src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.html 7 additions, 2 deletions...page/item-relationships/item-relationships.component.html
- src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.spec.ts 39 additions, 9 deletions...e/item-relationships/item-relationships.component.spec.ts
- src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts 65 additions, 49 deletions...m-page/item-relationships/item-relationships.component.ts
- src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html 38 additions, 0 deletions...tem-page/virtual-metadata/virtual-metadata.component.html
- src/app/+item-page/edit-item-page/virtual-metadata/virtual-metadata.component.spec.ts 102 additions, 0 deletions...-page/virtual-metadata/virtual-metadata.component.spec.ts
Please register or sign in to comment