lotte
|
bbac79bdfc
|
fixes after merge
|
2020-04-17 16:09:26 +02:00 |
|
lotte
|
92dca8d4e8
|
Merge branch 'master' into angular-cli
|
2020-04-17 16:09:12 +02:00 |
|
lotte
|
8bf241c182
|
angular cli
|
2020-03-18 16:03:40 +01:00 |
|
Kristof De Langhe
|
568b8ee1a7
|
68954: Tests + AoT build fixes
|
2020-03-04 14:38:38 +01:00 |
|
lotte
|
23cbc98208
|
small fixes + test fix
|
2019-11-28 15:10:48 +01:00 |
|
lotte
|
23a378bd26
|
fixes after merge with master
|
2019-11-25 12:11:40 +01:00 |
|
Kristof De Langhe
|
ed3f7dfc7b
|
Merge branch 'master' into w2p-65572_Add-support-for-bundles
Conflicts:
src/app/core/shared/item.model.ts
src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts
src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec.ts
src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.spec.ts
src/app/shared/testing/utils.ts
|
2019-11-21 14:14:39 +01:00 |
|
Michael W Spalti
|
e7302bd8af
|
Clear cache in mydspace redirect and reload methods.
|
2019-11-08 12:04:54 -08:00 |
|
lotte
|
4106e7cb21
|
fixed remaining issues and tests
|
2019-06-25 11:17:22 +02:00 |
|
lotte
|
f980b55c1c
|
refactored resource type and type mapping
|
2019-06-24 16:29:54 +02:00 |
|
lotte
|
81ba49f220
|
Simplified and refactored manual creation of remote data objects for tests
|
2019-05-28 14:58:10 +02:00 |
|
lotte
|
a0a0830e5f
|
61949: merged master, resolving conflicts
|
2019-05-24 16:57:38 +02:00 |
|
Giuseppe Digilio
|
16b8e91585
|
Added tests and comments
|
2019-04-02 15:18:06 +02:00 |
|