Commit Graph

2 Commits

Author SHA1 Message Date
Kristof De Langhe
47294d37bf Merge branch 'master' into Item-Collection_Mapper
Conflicts:
	resources/i18n/en.json
	src/app/+item-page/edit-item-page/edit-item-page.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+item-page/edit-item-page/item-status/item-status.component.html
	src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
	src/app/+item-page/edit-item-page/item-status/item-status.component.ts
	src/app/+item-page/item-page-routing.module.ts
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
2019-01-17 15:57:25 +01:00
Yana De Pauw
d9a393c8e6 Add Item Status Edit Actions
Add the Item Withdraw and Reistate action
Add the make Item Private and Public action
Add the Permanently Delete action
2018-12-18 16:52:11 +01:00