Merge branch 'w2p-55693_Item-mapping-to-collections' into w2p-55946_Item-mapping-on-item-level
Conflicts: src/app/core/data/item-data.service.ts
No related branches found
No related tags found
Showing
- resources/i18n/en.json 19 additions, 6 deletionsresources/i18n/en.json
- src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.html 6 additions, 6 deletions...lection-item-mapper/collection-item-mapper.component.html
- src/app/+collection-page/collection-item-mapper/collection-item-mapper.component.ts 25 additions, 16 deletions...ollection-item-mapper/collection-item-mapper.component.ts
- src/app/core/data/collection-data.service.ts 45 additions, 2 deletionssrc/app/core/data/collection-data.service.ts
- src/app/shared/object-collection/object-collection.component.ts 1 addition, 0 deletions...p/shared/object-collection/object-collection.component.ts
- src/app/shared/object-select/item-select/item-select.component.html 2 additions, 2 deletions...ared/object-select/item-select/item-select.component.html
- src/app/shared/object-select/object-select/object-select.component.ts 3 additions, 0 deletions...ed/object-select/object-select/object-select.component.ts
Loading
Please register or sign in to comment