Commit Graph

28 Commits

Author SHA1 Message Date
Kristof De Langhe
c8be50614a 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
2020-02-13 14:34:45 +01:00
Art Lowel
ed11cb9f01 Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete 2020-01-27 11:26:15 +01:00
Kristof De Langhe
b2ef5ee2fa Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates
Conflicts:
	package.json
	resources/i18n/en.json5
	src/app/+item-page/item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/bundle-data.service.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/object-updates/object-updates.service.ts
	src/app/core/shared/hal-endpoint.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/mocks/mock-request.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/trackable/abstract-trackable.component.ts
	yarn.lock
2020-01-24 14:21:20 +01:00
Samuel
4f57d7ae83 Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete 2020-01-09 17:55:18 +01:00
Samuel
4e679ec6db PR-530 Keep virtual metadata on relationship delete - community feedback 2020-01-09 13:53:42 +01:00
Samuel
891415daae taskid 66076 Keep virtual metadata on item delete - tests & docs & small fixes 2019-12-03 16:54:55 +01:00
Samuel
b1f4a90a58 taskid 66074 Keep virtual metadata on relationship delete - fix lint issues 2019-11-26 17:31:47 +01:00
Samuel
ae476baa62 taskid 66074 Keep virtual metadata on relationship delete 2019-11-26 16:44:31 +01:00
Kristof De Langhe
a1ac80e53a Merge branch 'master' into w2p-64961_Edit-bitstream-page
Conflicts:
	src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
	src/app/app-routing.module.ts
	src/app/shared/shared.module.ts
2019-09-12 13:21:08 +02:00
lotte
dc3302e73b Merge branch 'w2p-64574_Item-page-entities' into w2p-62849_relationships-in-submission 2019-08-28 14:28:06 +02:00
lotte
9907087dc3 62849: progress refactoring relationships 2019-08-08 16:02:58 +02:00
lotte
719d0e791c intermediate commit to see whats wrong 2019-08-08 15:33:13 +02:00
lotte
b6e9c5b840 refactorting relationship service functions 2019-08-07 16:21:49 +02:00
Kristof De Langhe
d734ed108e 63469: Intermediate commit 2019-07-04 17:52:14 +02:00
Kristof De Langhe
417f79ab6a 63184: Relationship list refreshing fix - Re-initializing itemUpdateSubscription 2019-06-27 11:55:10 +02:00
Kristof De Langhe
14d7437da9 63184: Edit-Relationships left/right Item refactoring 2019-06-26 17:47:44 +02:00
Kristof De Langhe
dacf813676 61142: Notifications on failed relationship delete requests 2019-04-18 17:24:24 +02:00
Kristof De Langhe
bbbd6959a8 61142: EditRelationshipList component to proper reload relationships and fix performance issues 2019-04-08 15:28:18 +02:00
Kristof De Langhe
01b60dbf34 61142: RemoveByHrefSubstring fix 2019-04-05 17:28:20 +02:00
Kristof De Langhe
b78b2e5b82 61142: EditRelationshipComponent tests + de-caching of requests in ItemRelationships 2019-04-05 13:46:48 +02:00
Kristof De Langhe
0cf4cdc1c5 61142: ItemRelationshipComponent test + item de-caching 2019-04-04 17:43:40 +02:00
Kristof De Langhe
bb68373489 61142: Working submit (except reloading lists) and JSDocs 2019-04-04 15:19:28 +02:00
Kristof De Langhe
1e31fadb70 61142: Submit intermediate commit 2019-04-04 12:39:25 +02:00
Kristof De Langhe
3d9b3c68f3 61142: Layout improvement 2019-04-03 17:51:10 +02:00
Kristof De Langhe
7a74c3355b 61142: RelationshipService 2019-04-03 14:22:07 +02:00
Kristof De Langhe
a99fa4d4a2 61142: Renaming and refactoring item-relationships 2019-04-03 13:05:43 +02:00
Kristof De Langhe
4a749cf91d 61142: AbstractItemUpdate component and refactoring of item-metadata and item-relationships 2019-04-03 11:58:45 +02:00
Kristof De Langhe
cc862af249 61142: Item relations initial edit page 2019-04-02 17:36:51 +02:00