Commit Graph

208 Commits

Author SHA1 Message Date
Kristof De Langhe
03887e7c41 63669: Intermediate commit 2019-07-11 17:57:54 +02:00
Kristof De Langhe
3d9af688e7 63669: Edit Communtiy/Collection Tabs 2019-07-10 16:43:20 +02:00
Tim Donohue
95bd8c8653 Merge pull request #401 from atmire/Group-Entity-Types
Group logical entity types together
2019-05-31 11:42:13 -05:00
Art Lowel
b352137fb3 add i18n labels for person facets 2019-05-29 18:05:30 +02:00
Kristof De Langhe
e9bfb77300 Merge branch 'master' into w2p-62264_Group-logical-entity-types-together 2019-05-20 10:09:20 +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
Kristof De Langhe
461eacff45 62264: Group messages 2019-05-10 10:19:51 +02:00
Art Lowel
396f02bb68 replace placeholder images with more consistent, scalable ones 2019-04-30 16:04:02 +02:00
Art Lowel
fea07feefe show additional metadata fields for projects 2019-04-30 14:22:23 +02:00
Art Lowel
fd26f19041 show entity time on item pages and in search results 2019-04-30 14:07:01 +02:00
Giuseppe Digilio
7492c21ce6 added test for MyDSpaceNewSubmissionComponent 2019-04-25 12:40:13 +02:00
Giuseppe Digilio
330a70657d Refactored ItemDetailPreviewComponent 2019-04-05 16:33:58 +02:00
Giuseppe Digilio
90b88de9f6 Changed mydspace item status labels 2019-04-05 13:30:05 +02:00
Giuseppe Digilio
a2b91eb727 Changed mydspace item status labels 2019-04-05 13:04:57 +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
Giuseppe Digilio
ad9ccdd625 Merge remote-tracking branch 'remotes/origin/master' into mydspace
# Conflicts:
#	src/app/core/data/request.service.ts
2019-04-01 10:03:11 +02:00
Giuseppe Digilio
6556d4453d Merge remote-tracking branch 'remotes/origin/master' into submission 2019-03-29 15:22:15 +01:00
Art Lowel
8996716d71 Merge remote-tracking branch 'upstream/master' into configurable_entities 2019-03-29 13:23:05 +01:00
lotte
bb2df05bbe fixed messages and hid pagination gear on home page 2019-03-28 14:54:53 +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
6335d61dda Added more comments 2019-03-20 19:57:07 +01:00
Giuseppe Digilio
e90d80bce7 Added mandatory property for date and group selection in bitstream metadata edit form 2019-03-17 16:30:43 +01:00
Tim Donohue
f396da34b4 Merge branch 'master' into configurable_entities 2019-03-15 15:11:53 -05: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
52906e71c4 Intermediate commit 2019-03-08 19:49:07 +01:00
lotte
0a1138fbbd Merge branch 'master' into w2p-60113_admin-select-dso-modal
Conflicts:
	src/app/shared/shared.module.ts
2019-03-08 16:40:52 +01:00
Giuseppe Digilio
2009ee566c Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	src/app/core/data/browse-items-response-parsing-service.ts
#	src/app/shared/shared.module.ts
2019-03-08 16:30:39 +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
c60175ac80 fixed metadata value issues 2019-03-07 15:00:30 +01:00
lotte
9abbfa955e refactored, started tests 2019-03-07 14:25:48 +01:00
Kristof De Langhe
d5fe5c432b Merge branch 'master' into Browse-By-Date
Conflicts:
	config/environment.default.js
	src/config/global-config.interface.ts
2019-03-04 11:15:49 +01:00
Giuseppe Digilio
167c50e9a3 Dispaly an error notification when an error occured on submission save 2019-02-28 18:39:12 +01:00
Kristof De Langhe
bb3e9c43fb 59695: PR Feedback - scope fix, startsWith fix, starts-with month 2019-02-26 13:38:46 +01:00
lotte
c40179fc88 Merge branch 'master' into w2p-59334_edit-item-metadata-branch
Conflicts:
	src/app/+community-page/community-page.component.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/metadata-schema-data.service.ts
	src/app/core/data/request.models.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/metadata/normalized-metadata-schema.model.ts
	src/app/core/shared/metadatum.model.ts
	src/app/core/shared/operators.spec.ts
	src/app/shared/shared.module.ts
2019-02-25 10:28:18 +01:00
lotte
35be122eea bug fixing 2019-02-25 09:57:46 +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
Kristof De Langhe
b85fe49670 Merge branch 'master' into w2p-60168_Alphabetic-browse-widget
Conflicts:
	src/app/core/browse/browse.service.ts
	src/app/shared/shared.module.ts
2019-02-22 09:02:46 +01:00
Tim Donohue
eb818e4d69 Merge pull request #355 from atmire/modifying-metadata-registries
Modifying metadata registries
2019-02-21 14:27:23 -06:00
Giuseppe Digilio
83562b2f32 Merge remote-tracking branch 'remotes/origin/master' into submission
# Conflicts:
#	src/app/core/data/browse-entries-response-parsing.service.spec.ts
#	src/app/core/data/browse-entries-response-parsing.service.ts
2019-02-21 18:49:36 +01:00
Kristof De Langhe
fe5f436654 Merge branch 'master' into w2p-60168_Alphabetic-browse-widget
Conflicts:
	src/app/core/browse/browse.service.spec.ts
	src/app/core/browse/browse.service.ts
	src/app/core/data/dso-response-parsing.service.ts
	src/app/shared/shared.module.ts
2019-02-21 13:35:21 +01:00
lotte
3c104a460b 59334: removed unnecessary config entry 2019-02-21 11:59:04 +01:00
Kristof De Langhe
9a0989f240 60168: Starts-With text dropdown options + styling 2019-02-20 10:08:12 +01:00
Kristof De Langhe
16f448021b 60168: Browse-by startsWith text component 2019-02-20 08:54:51 +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
bfa1e77177 finalised edit item page 2019-02-19 10:13:49 +01:00
Giuseppe Digilio
efdc351de0 fixed i18n label 2019-02-18 17:53:49 +01:00
Giuseppe Digilio
8422549d26 fixed subscriptions and added i18n label 2019-02-18 16:53:15 +01:00