Merge branch 'master' into w2p-64961_Edit-bitstream-page

Conflicts:
	resources/i18n/en.json5
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/core/data/item-data.service.ts
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2019-09-17 15:38:02 +02:00
45 changed files with 980 additions and 241 deletions

View File

@@ -20,6 +20,7 @@ import { ItemRelationshipsComponent } from './item-relationships/item-relationsh
import { EditRelationshipComponent } from './item-relationships/edit-relationship/edit-relationship.component';
import { EditRelationshipListComponent } from './item-relationships/edit-relationship-list/edit-relationship-list.component';
import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-item-update.component';
import { ItemMoveComponent } from './item-move/item-move.component';
/**
* Module that contains all components related to the Edit Item page administrator functionality
@@ -49,7 +50,8 @@ import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-ite
ItemEditBitstreamComponent,
EditInPlaceFieldComponent,
EditRelationshipComponent,
EditRelationshipListComponent
EditRelationshipListComponent,
ItemMoveComponent,
]
})
export class EditItemPageModule {