Commit Graph

227 Commits

Author SHA1 Message Date
Kristof De Langhe
4afb35c53e 64574: View-more/less for related-items + refactoring item pages 2019-08-27 14:12:39 +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
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
Art Lowel
64a60f561e flatten i18n files 2019-07-26 11:09:06 +02:00
Tim Donohue
735408c336 Merge pull request #419 from atmire/selectable-themes
Selectable themes
2019-07-15 22:34:58 +02:00
Tim Donohue
23a4a3f57b Merge pull request #420 from atmire/w2p-62651_Item-display-and-lists-field-changes
DS-4223 Metadata Schemas for configurable entities
2019-07-12 19:21:27 +02:00
Kristof De Langhe
74813aaedc Merge branch 'master' into w2p-63184_Relations-delete-feedback-1 2019-06-26 14:59:31 +02:00
lotte
1753d55d77 Merge branch 'master' into selectable-themes
Conflicts:
	src/app/core/core.effects.ts
2019-06-06 15:35:18 +02:00
Ben Bosman
2b1ce1e39a metadata field updates for schema.org 2019-06-06 13:23:12 +02:00
Ben Bosman
4f8d60c4d2 Discovery facet labels for new metadata fields 2019-06-04 12:03:57 +02:00
Kristof De Langhe
a7fd250f4b Merge branch 'master' into w2p-62063_Configurable-Browse-By 2019-06-03 15:25:01 +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
fca9b4d481 Merge branch 'master' into w2p-62063_Configurable-Browse-By 2019-05-24 14:13: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
e9bfb77300 Merge branch 'master' into w2p-62264_Group-logical-entity-types-together 2019-05-20 10:09:20 +02:00
lotte
63387d6dbe theme for entity pages 2019-05-14 11:50:55 +02:00
lotte
eddf106557 added banner and changed fonts 2019-05-14 11:39:56 +02:00
lotte
ddfbbcc223 added custom theming 2019-05-14 11:39:34 +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
Kristof De Langhe
41e55d8d44 62063: Configurable Browse-By menus 2019-04-30 16:54:50 +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
Kristof De Langhe
dacf813676 61142: Notifications on failed relationship delete requests 2019-04-18 17:24:24 +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
1e31fadb70 61142: Submit intermediate commit 2019-04-04 12:39:25 +02:00
Kristof De Langhe
4a749cf91d 61142: AbstractItemUpdate component and refactoring of item-metadata and item-relationships 2019-04-03 11:58:45 +02:00
Kristof De Langhe
cc862af249 61142: Item relations initial edit page 2019-04-02 17:36:51 +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