benbosman
|
c4c6de66de
|
Merge pull request #402 from atmire/Item-Relations-Edit-Delete
Item relations edit delete
|
2019-09-05 15:59:41 +02:00 |
|
Kristof De Langhe
|
9afcd48f12
|
Merge branch 'master' into w2p-64225_Relations-delete-feedback-3
Conflicts:
resources/i18n/en.json
src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
src/app/+search-page/search-service/search.service.ts
src/app/core/core.module.ts
src/app/core/shared/item.model.ts
|
2019-08-13 12:03:29 +02:00 |
|
Yana De Pauw
|
c325e6d61b
|
Merge branch 'master' into w2p-62769_Bitstream-format-registry
Conflicts:
src/app/+admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
src/app/core/core.module.ts
src/app/core/registry/registry-bitstreamformats-response.model.ts
src/app/core/registry/registry.service.ts
src/app/core/shared/bitstream-format.model.ts
|
2019-08-06 17:22:03 +02:00 |
|
Yana De Pauw
|
279b80b4de
|
62769: Bitstream format registry
|
2019-08-05 13:14:03 +02:00 |
|
Kristof De Langhe
|
6f347868ff
|
Merge branch 'master' into w2p-63469_Relations-delete-feedback-2
Conflicts:
src/app/+item-page/simple/item-types/shared/item-relationships-utils.ts
|
2019-07-30 10:34:22 +02:00 |
|
lotte
|
200b29f6f8
|
Merge branch 'master' into object-factory-refactoring
Conflicts:
src/app/submission/sections/upload/section-upload.component.spec.ts
|
2019-07-19 09:08:03 +02:00 |
|
lotte
|
aff3f3df03
|
solved issues with browse pages
|
2019-07-18 16:28:07 +02:00 |
|
lotte
|
651b4100dd
|
solved issue with submission
|
2019-07-17 13:47:59 +02:00 |
|
lotte
|
f91e52f1ad
|
61949: fixed bug with adding a new md field
|
2019-07-15 09:59:29 +02:00 |
|
Alexander Sulfrian
|
9ed8722169
|
Add missing ResourcePolicyService
|
2019-06-18 16:20:55 +02:00 |
|
lotte
|
35f73708ef
|
fixed issues after merging
|
2019-05-27 15:09:51 +02:00 |
|
lotte
|
233909d6ca
|
Merge branch 'master' into w2p-61949_object-factory-refactoring
Conflicts:
src/app/core/cache/models/normalized-object-factory.ts
src/app/core/cache/response.models.ts
src/app/core/core.module.ts
src/app/core/data/base-response-parsing.service.ts
src/app/core/shared/resource-type.ts
src/app/core/submission/submission-response-parsing.service.ts
|
2019-05-24 15:42:24 +02:00 |
|
Kristof De Langhe
|
796afb3919
|
Merge branch 'master' into w2p-61142_Relations-add-edit-delete-and-permissions
Conflicts:
src/app/core/cache/object-cache.service.ts
src/app/core/core.module.ts
src/app/core/data/request.service.ts
src/app/core/shared/item.model.ts
|
2019-05-20 13:08:33 +02:00 |
|
Kristof De Langhe
|
0390f67d01
|
Merge branch 'master' into w2p-62372_Final-master-merge
Conflicts:
config/environment.default.js
resources/i18n/en.json
src/app/+search-page/paginated-search-options.model.ts
src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
src/app/+search-page/search-options.model.ts
src/app/+search-page/search-page.component.spec.ts
src/app/+search-page/search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/+search-page/search-service/search-configuration.service.ts
src/app/core/cache/response.models.ts
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/object-list/wrapper-list-element/wrapper-list-element.component.ts
src/app/shared/services/route.service.ts
|
2019-05-13 12:47:21 +02:00 |
|
lotte
|
b2ceb8e9d6
|
61949: finished refactoring, adding type doc
|
2019-04-29 16:21:36 +02:00 |
|
lotte
|
a5086b8d11
|
61949: replacing object factories with decorator
|
2019-04-24 16:51:46 +02:00 |
|
Giuseppe Digilio
|
c959b49d19
|
Removed unsed services
|
2019-04-19 18:17:16 +02:00 |
|
Kristof De Langhe
|
7a74c3355b
|
61142: RelationshipService
|
2019-04-03 14:22:07 +02:00 |
|
Kristof De Langhe
|
9766a65c3a
|
Merge branch 'master' into w2p-61493_Configurable-entities-master-merge
Conflicts:
src/app/+item-page/item-page.module.ts
src/app/+search-page/search-filters/search-filter/search-filter.service.ts
src/app/+search-page/search-page.component.ts
src/app/+search-page/search-page.module.ts
src/app/core/shared/dspace-object.model.ts
src/app/core/shared/item.model.ts
src/app/core/shared/metadata.models.ts
src/app/core/shared/resource-type.ts
src/app/shared/services/route.service.spec.ts
src/app/shared/services/route.service.ts
src/app/thumbnail/thumbnail.component.html
|
2019-04-01 15:52:53 +02:00 |
|
Art Lowel
|
8996716d71
|
Merge remote-tracking branch 'upstream/master' into configurable_entities
|
2019-03-29 13:23:05 +01:00 |
|
Giuseppe Digilio
|
60f9df901e
|
Merge remote-tracking branch 'remotes/origin/submission' into mydspace
# Conflicts:
# resources/i18n/en.json
# src/app/core/data/request.service.spec.ts
# src/app/core/data/request.service.ts
# src/app/core/json-patch/selectors.ts
# src/app/shared/shared.module.ts
|
2019-03-27 16:01:26 +01:00 |
|
Giuseppe Digilio
|
c9cd9ce215
|
Merge remote-tracking branch 'remotes/upstreamatmire/Search-optimizations' into mydspace
# Conflicts:
# resources/i18n/en.json
# src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
# src/app/+search-page/search-filters/search-filter/search-filter.component.ts
# src/app/+search-page/search-filters/search-filters.component.html
# src/app/+search-page/search-filters/search-filters.component.ts
# src/app/+search-page/search-page.component.ts
# src/app/+search-page/search-page.module.ts
# src/app/+search-page/search-service/search.service.ts
# src/app/core/cache/builders/remote-data-build.service.ts
# src/app/core/core.module.ts
# src/app/core/data/paginated-list.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/shared/services/route.service.ts
# src/app/shared/shared.module.ts
|
2019-03-26 10:01:57 +01:00 |
|
Giuseppe Digilio
|
dee38f3043
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# resources/i18n/en.json
# src/app/core/cache/builders/remote-data-build.service.ts
# src/app/core/data/request.service.spec.ts
# src/app/core/data/request.service.ts
|
2019-03-21 15:10:15 +01:00 |
|
Giuseppe Digilio
|
bbd6225cd4
|
Move SubmissionRestService to submission core dir
|
2019-03-18 09:57:31 +01:00 |
|
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 |
|
Giuseppe Digilio
|
11e77086ae
|
Merge remote-tracking branch 'remotes/origin/submission' into mydspace
|
2019-03-11 20:06:42 +01:00 |
|
Giuseppe Digilio
|
f07aafaf15
|
Added services and models
|
2019-03-08 16:38:05 +01:00 |
|
Giuseppe Digilio
|
ab42f4b190
|
Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
# src/app/+item-page/edit-item-page/item-status/item-status.component.spec.ts
# src/app/core/cache/builders/remote-data-build.service.ts
# src/app/core/core.effects.ts
# src/app/core/core.reducers.ts
# src/app/core/data/comcol-data.service.spec.ts
# src/app/core/data/data.service.spec.ts
# src/app/core/data/data.service.ts
# src/app/core/shared/dspace-object.model.ts
# src/app/shared/shared.module.ts
# src/styles/_custom_variables.scss
|
2019-03-08 09:52:47 +01:00 |
|
lotte
|
61a5620efe
|
refactored lookup
|
2019-03-07 14:24:24 +01:00 |
|
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 |
|
lotte
|
0ebb0de3dd
|
59334: edit metadata finetuning
|
2019-02-19 14:49:26 +01:00 |
|
Kristof De Langhe
|
d6a60d1adc
|
Merge remote-tracking branch 'atmire/master' into modifying-metadata-registries
Conflicts:
src/app/+community-page/community-page.component.ts
src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
src/app/+item-page/edit-item-page/item-private/item-private.component.ts
src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
src/app/+item-page/edit-item-page/item-public/item-public.component.ts
src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
src/app/core/auth/server-auth.service.ts
src/app/core/cache/response.models.ts
src/app/core/data/item-data.service.spec.ts
src/app/core/data/item-data.service.ts
src/app/core/data/request.models.ts
src/app/core/index/index.effects.ts
src/app/core/metadata/metadata.service.spec.ts
src/app/core/shared/operators.spec.ts
src/app/header/header.component.spec.ts
src/app/shared/form/form.component.ts
|
2019-02-13 12:47:17 +01:00 |
|
lotte
|
ace523ed14
|
intermediate commit for tests
|
2019-02-08 14:42:34 +01:00 |
|
lotte
|
953c0ecfc8
|
Merge branch 'delete-communities-and-collections' into w2p-59334_edit-item-metadata-branch
Conflicts:
src/app/+community-page/community-page.component.ts
src/app/+item-page/edit-item-page/item-delete/item-delete.component.spec.ts
src/app/+item-page/edit-item-page/item-delete/item-delete.component.ts
src/app/+item-page/edit-item-page/item-private/item-private.component.ts
src/app/+item-page/edit-item-page/item-public/item-public.component.spec.ts
src/app/+item-page/edit-item-page/item-public/item-public.component.ts
src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.spec.ts
src/app/+item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.spec.ts
src/app/+item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
src/app/+item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec.ts
src/app/core/auth/server-auth.service.ts
src/app/core/cache/response.models.ts
src/app/core/data/item-data.service.spec.ts
src/app/core/data/item-data.service.ts
src/app/core/data/request.models.ts
src/app/core/index/index.effects.ts
src/app/core/metadata/metadata.service.spec.ts
src/app/core/shared/operators.spec.ts
src/app/header/header.component.spec.ts
src/app/shared/form/form.component.ts
|
2019-01-25 13:34:09 +01:00 |
|
Kristof De Langhe
|
31b3a1fdaa
|
Merge branch 'master' into w2p-58789_Metadata-Registry-UI-Part-2
Conflicts:
src/app/+admin/admin-registries/metadata-schema/metadata-schema.component.ts
src/app/+community-page/community-page.component.html
src/app/app.reducer.ts
src/app/core/auth/server-auth.service.ts
src/app/core/core.module.ts
src/app/core/data/item-data.service.spec.ts
src/app/core/data/item-data.service.ts
src/app/core/index/index.effects.ts
src/app/core/index/index.reducer.spec.ts
src/app/core/index/index.reducer.ts
src/app/core/shared/operators.spec.ts
src/app/core/shared/operators.ts
src/app/header/header.component.spec.ts
|
2019-01-24 13:18:20 +01:00 |
|
Kristof De Langhe
|
73f24a5dc1
|
58789: Rest call for creating metadata schemas
|
2019-01-22 10:39:32 +01:00 |
|
Tim Donohue
|
2e53c3e3cf
|
Merge branch 'master' into configurable_entities
|
2019-01-21 14:26:47 -06:00 |
|
Samuel
|
962bafcce2
|
taskid 58789 Metadata Registry UI Part 2
|
2019-01-19 20:53:15 +01:00 |
|
Art Lowel
|
586a4ac35b
|
add docs, rename classes for clarity
|
2019-01-17 14:59:48 +01:00 |
|
Giuseppe Digilio
|
6b75da27a4
|
Renamed SectionFormOperationsService from FormOperationsService
|
2019-01-12 16:11:16 +01:00 |
|
Giuseppe Digilio
|
feb8172b32
|
Made JsonPatchOperationsService an abstract class
|
2018-12-28 18:31:14 +01:00 |
|
Giuseppe Digilio
|
eda0ebb21c
|
Merge remote-tracking branch 'origin/master' into submission
# Conflicts:
# resources/i18n/en.json
# src/app/app.component.scss
# src/app/app.component.spec.ts
# src/app/app.component.ts
# src/app/app.module.ts
# src/app/shared/chips/chips.component.spec.ts
# src/app/shared/chips/models/chips-item.model.spec.ts
# src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.html
# src/app/shared/form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component.html
# src/app/shared/shared.module.ts
# yarn.lock
|
2018-12-20 17:02:46 +01:00 |
|
lotte
|
42d1bdb3d8
|
Merge branch 'master' into w2p-54472_Create-community-and-collection-pages
Conflicts:
resources/i18n/en.json
src/app/+community-page/community-page.component.html
src/app/+community-page/community-page.module.ts
src/app/core/auth/server-auth.service.ts
src/app/core/core.module.ts
src/app/core/index/index.effects.ts
src/app/core/index/index.reducer.spec.ts
src/app/core/index/index.reducer.ts
src/app/header/header.component.spec.ts
|
2018-12-20 15:59:23 +01:00 |
|
lotte
|
7a12332d70
|
Edit and create communities
|
2018-12-20 15:54:47 +01:00 |
|
lotte
|
c17b395ba0
|
57053: intermediate commit active issue
|
2018-12-05 12:46:22 +01:00 |
|
lotte
|
567d4dc331
|
sidebar animations
|
2018-11-23 14:44:11 +01:00 |
|
lotte
|
cd5c7b72c2
|
57053: progress menu bar
|
2018-11-16 17:00:06 +01:00 |
|
Giuseppe
|
ea227aef64
|
Move all config stuff to a single directory
|
2018-10-17 15:01:55 +02:00 |
|
lotte
|
2330e96158
|
intermediate commit
|
2018-10-17 13:18:01 +02:00 |
|