Giuseppe Digilio
|
a42dd19624
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# 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
|
2019-02-22 12:20:28 +01:00 |
|
Giuseppe Digilio
|
880d9ed069
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# package.json
# src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
# src/app/+item-page/edit-item-page/item-private/item-private.component.spec.ts
# src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
# src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
# src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
# src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
# src/app/+search-page/search-service/search.service.spec.ts
# src/app/core/auth/auth-response-parsing.service.spec.ts
# src/app/core/auth/auth-response-parsing.service.ts
# src/app/core/cache/builders/remote-data-build.service.ts
# src/app/core/cache/response-cache.reducer.spec.ts
# src/app/core/cache/response-cache.service.spec.ts
# src/app/core/cache/response.models.ts
# src/app/core/config/config-response-parsing.service.ts
# src/app/core/core.effects.ts
# src/app/core/core.module.ts
# src/app/core/core.reducers.ts
# src/app/core/data/base-response-parsing.service.ts
# src/app/core/data/data.service.ts
# src/app/core/data/item-data.service.spec.ts
# src/app/core/data/request.models.ts
# src/app/core/data/request.service.spec.ts
# src/app/core/data/request.service.ts
# src/app/core/integration/integration-response-parsing.service.spec.ts
# src/app/core/integration/integration-response-parsing.service.ts
# src/app/core/integration/integration.service.ts
# src/app/core/metadata/metadata.service.spec.ts
# src/app/core/registry/registry.service.spec.ts
# src/app/core/shared/hal-endpoint.service.ts
# src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control.component.ts
# src/app/shared/mocks/mock-response-cache.service.ts
# src/app/shared/shared.module.ts
|
2019-02-19 17:30:33 +01:00 |
|
Chris Wilper
|
ea9ce6194c
|
DS-4107 Update tests and mocks for metadata as map
|
2019-02-14 12:29:40 -05:00 |
|
lotte
|
2330e96158
|
intermediate commit
|
2018-10-17 13:18:01 +02:00 |
|
Giuseppe
|
7b483ce052
|
Fixed merge issues
|
2018-10-17 12:25:46 +02:00 |
|
Kristof De Langhe
|
883a1d8881
|
Issues 252,253: Browse by title and browse by metadata (author)
|
2018-08-08 11:36:42 +02:00 |
|