Merge branch 'master' into w2p-63469_Relations-delete-feedback-2

Conflicts:
	src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
This commit is contained in:
Kristof De Langhe
2019-07-30 10:34:22 +02:00
218 changed files with 2967 additions and 1144 deletions

View File

@@ -60,6 +60,7 @@ import { HALEndpointService } from './shared/hal-endpoint.service';
import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service';
import { FacetValueMapResponseParsingService } from './data/facet-value-map-response-parsing.service';
import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
import { ResourcePolicyService } from './data/resource-policy.service';
import { RegistryService } from './registry/registry.service';
import { RegistryMetadataschemasResponseParsingService } from './data/registry-metadataschemas-response-parsing.service';
import { RegistryMetadatafieldsResponseParsingService } from './data/registry-metadatafields-response-parsing.service';
@@ -126,6 +127,7 @@ const PROVIDERS = [
MetadataService,
ObjectCacheService,
PaginationComponentOptions,
ResourcePolicyService,
RegistryService,
NormalizedObjectBuildService,
RemoteDataBuildService,