hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 18:44:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into submission

Browse Source 
# Conflicts:
#	src/app/core/cache/models/normalized-object-factory.ts
#	src/app/core/cache/response.models.ts
#	src/app/core/data/registry-metadatafields-response-parsing.service.ts
#	src/app/core/data/registry-metadataschemas-response-parsing.service.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/request.service.ts
#	src/app/core/shared/collection.model.ts
#	src/app/core/shared/dspace-object.model.ts
#	src/app/core/shared/resource-type.ts
This commit is contained in:
Giuseppe Digilio
2019-02-22 12:20:28 +01:00
parent 84cf0d055a eb818e4d69
commit a42dd19624
115 changed files with 3820 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/core.module.ts
View File

@@ -62,7 +62,6 @@ import { FacetValueMapResponseParsingService } from './data/facet-value-map-resp
import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
import { RegistryService } from './registry/registry.service';
import { RegistryMetadataschemasResponseParsingService } from './data/registry-metadataschemas-response-parsing.service';
import { MetadataschemaParsingService } from './data/metadataschema-parsing.service';
import { RegistryMetadatafieldsResponseParsingService } from './data/registry-metadatafields-response-parsing.service';
import { RegistryBitstreamformatsResponseParsingService } from './data/registry-bitstreamformats-response-parsing.service';
import { WorkflowitemDataService } from './submission/workflowitem-data.service';
@@ -72,6 +71,7 @@ import { FileService } from './shared/file.service';
import { SubmissionRestService } from '../submission/submission-rest.service';
import { BrowseItemsResponseParsingService } from './data/browse-items-response-parsing-service';
import { DSpaceObjectDataService } from './data/dspace-object-data.service';
import { MetadataschemaParsingService } from './data/metadataschema-parsing.service';
import { CSSVariableService } from '../shared/sass-helper/sass-helper.service';
import { MenuService } from '../shared/menu/menu.service';
import { SubmissionJsonPatchOperationsService } from './submission/submission-json-patch-operations.service';
@@ -126,7 +126,6 @@ const PROVIDERS = [
RegistryMetadataschemasResponseParsingService,
RegistryMetadatafieldsResponseParsingService,
RegistryBitstreamformatsResponseParsingService,
MetadataschemaParsingService,
DebugResponseParsingService,
SearchResponseParsingService,
ServerResponseService,
@@ -145,6 +144,7 @@ const PROVIDERS = [
JsonPatchOperationsBuilder,
AuthorityService,
IntegrationResponseParsingService,
MetadataschemaParsingService,
UploaderService,
UUIDService,
NotificationsService,