Commit Graph

6 Commits

Author SHA1 Message Date
Kristof De Langhe
6c3fb556d8 Merge remote-tracking branch 'atmire/mixing-text-authority-entities' into w2p-61133_Merge-345-and-master
Conflicts:
	src/app/+collection-page/collection-page.component.ts
	src/app/+collection-page/collection-page.module.ts
	src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
	src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
	src/app/+item-page/simple/field-components/specific-field/item-page-field.component.html
	src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
	src/app/+search-page/search-service/search.service.ts
	src/app/core/core.module.ts
	src/app/core/data/base-response-parsing.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/request.service.spec.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/metadatum.model.ts
	src/app/core/shared/operators.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
2019-03-15 09:59:30 +01:00
lotte
8a9f57966f Fixed conflicts with new metadata map 2019-02-26 16:06:33 +01:00
Chris Wilper
c2c59cd85a DS-4107 Improve variable naming 2019-02-20 16:36:38 -05:00
Chris Wilper
2368df9513 DS-4107 Retrieve and model metadata as a map 2019-02-14 12:29:35 -05:00
Kristof De Langhe
e4eee7ce27 56434: Docs for all item-page-metadata-field, related-entities, item-page and metadata-values componens 2018-10-24 11:05:32 +02:00
William Welling
3d02e660da fixed core and shared module usage, lazy loading modules 2017-09-26 11:44:07 -05:00