Commit Graph

19 Commits

Author SHA1 Message Date
Kristof De Langhe
6a016cd17f 74199: ItemResolver item to dso refactor 2020-10-20 16:40:01 +02:00
Art Lowel
bd9a6c487f Merge branch 'master' into metadata-and-relationships-combined-in-submission 2020-07-03 09:26:57 +02:00
Art Lowel
bcd93de708 Merge branch 'master' into metadata-and-relationships-combined-in-submission 2020-07-01 16:44:38 +02:00
Kristof De Langhe
5884308037 Merge branch 'master' into w2p-65272_Edit-collection-item-template
Conflicts:
	src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
	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/core/core.module.ts
	src/app/core/data/data.service.ts
2020-07-01 11:47:19 +02:00
Art Lowel
f4387ac212 Merge branch 'master' into metadata-and-relationships-combined-in-submission 2020-06-30 12:06:56 +02:00
Art Lowel
3e6195a124 Merge branch 'master' into metadata-and-relationships-combined-in-submission 2020-06-30 11:49:08 +02:00
Art Lowel
e119967325 fix issue where beforeEach wouldn't wait for dropBitstream to end 2020-06-29 17:24:00 +02:00
Kristof De Langhe
752cf97787 71380: Fix tests 2020-06-17 13:12:49 +02:00
lotte
aa9570c776 Merge branch 'master' into metadata-and-relationships-combined-in-submission 2020-05-12 17:19:08 +02:00
Kristof De Langhe
67b73ff921 70597: Test fixes 2020-05-11 13:21:01 +02:00
Art Lowel
2a6e0c796a fix tests 2020-04-29 14:12:45 +02:00
lotte
bbac79bdfc fixes after merge 2020-04-17 16:09:26 +02:00
Kristof De Langhe
5849499569 68346: Test fixes 2020-03-14 15:13:27 +01:00
Kristof De Langhe
4bbbc93f6c 68346: Tests fixes 2020-03-06 11:08:56 +01:00
Kristof De Langhe
14ea71f536 68346: Test fixes 2020-01-24 14:34:11 +01:00
Kristof De Langhe
dd5f40858d 65717: Additional tests and fixes 2019-10-29 13:50:15 +01:00
Kristof De Langhe
4efbbf1c99 65717: Test cases 2019-10-28 16:35:18 +01:00
Kristof De Langhe
a56d551ef1 94961: Edit-bitstream loading message, error notifications and AoT fixes 2019-09-17 15:31:54 +02:00
Kristof De Langhe
e187778dbc 63945: Tests 2019-07-29 17:20:08 +02:00