Commit Graph

72 Commits

Author SHA1 Message Date
Dániel Péter Sipos
23c01b4683 #0-remove 2020-10-28 10:44:51 +01:00
Dániel Péter Sipos
d7d527b735 #0 fix thumbnail 2020-10-27 10:00:21 +01:00
lotte
aa9570c776 Merge branch 'master' into metadata-and-relationships-combined-in-submission 2020-05-12 17:19:08 +02:00
Art Lowel
afe394e2a4 Merge branch 'master' into w2p-70237_entities-orgunit-submission-fix 2020-04-28 17:45:29 +02:00
lotte
92dca8d4e8 Merge branch 'master' into angular-cli 2020-04-17 16:09:12 +02:00
lotte
74db9030b0 working on fixes for OrgUnit field in submission 2020-04-07 18:17:37 +02:00
Kristof De Langhe
08a6fa7c96 Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates
Conflicts:
	src/app/core/cache/server-sync-buffer.effects.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
2020-03-19 17:12:04 +01:00
lotte
8bf241c182 angular cli 2020-03-18 16:03:40 +01:00
Art Lowel
2922deff50 small UI tweaks, fix tests 2020-03-10 18:38:04 +01:00
lotte
401393c8bd grid view for admin search results 2020-03-10 10:49:18 +01:00
Kristof De Langhe
4bbbc93f6c 68346: Tests fixes 2020-03-06 11:08:56 +01:00
Art Lowel
f52c1d0ba5 Merge branch 'master' into w2p-68405_Only-retrieve-related-objects-when-necessary 2020-02-21 12:16:40 +01:00
Art Lowel
bc7c92f44c removed remaining normalized models and related services 2020-02-17 18:35:10 +01:00
Marie Verdonck
42d6527ca9 68405: More test fixes 2020-02-17 18:18:00 +01:00
Marie Verdonck
be0158fc9c 68405: More test fixes 2020-02-17 18:17:23 +01:00
Marie Verdonck
fb153b7b13 68405: test fixes; tbc 2020-02-17 18:17:23 +01:00
Art Lowel
ad4e8eeb8c refactored items, bundles and bitstreams, test builders 2020-02-17 18:09:52 +01:00
lotte
04cb75e786 upgraded to angular 8 2020-02-13 11:09:20 +01:00
lotte
168e74d1fa Merge branch 'master' into clean-relationships-in-submission 2019-11-25 11:18:57 +01:00
Kristof De Langhe
ed3f7dfc7b Merge branch 'master' into w2p-65572_Add-support-for-bundles
Conflicts:
	src/app/core/shared/item.model.ts
	src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
	src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
	src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
	src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
	src/app/entity-groups/research-entities/item-list-elements/orgunit/orgunit-list-element.component.spec.ts
	src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
	src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.spec.ts
	src/app/shared/object-grid/item-grid-element/item-types/publication/publication-grid-element.component.spec.ts
	src/app/shared/object-list/item-list-element/item-types/publication/publication-list-element.component.spec.ts
	src/app/shared/testing/utils.ts
2019-11-21 14:14:39 +01:00
lotte
f79e210959 Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission 2019-10-17 12:49:22 +02:00
lotte
d962e40c58 added TypeDoc 2019-10-16 11:21:25 +02:00
lotte
7ca88021c9 added tests, aot fixes, lint fixes 2019-10-15 15:58:40 +02:00
lotte
bafb2f3490 fixed existing tests and added linkType 2019-10-14 16:27:08 +02:00
lotte
dfe1143184 metadata representation 2019-10-10 16:18:14 +02:00
lotte
0fb12c4274 refactored mydspace/listelements etc 2019-10-08 15:51:31 +02:00
lotte
a1f144aa0b replaced type input by getRenderType method 2019-10-04 16:06:59 +02:00
lotte
9badabade6 Split typed list/grid elements into normal and search result 2019-10-03 16:26:58 +02:00
lotte
5b6aa951ad continued refactoring listable objects 2019-10-02 15:43:19 +02:00
lotte
20274bd4af refactored ItemViewMode to be part of ViewMode and added the Context enum 2019-09-27 13:19:26 +02:00
lotte
e584489eaf 65195: removed duplicate view mode, renamed existing modes from SetViewMode 2019-09-27 11:22:55 +02:00
lotte
9723d929e1 resolved issues after merge with master 2019-09-05 10:44:37 +02:00
lotte
b634799ef9 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-09-05 10:16:51 +02:00
lotte
650b77081f Merge branch 'master' into w2p-62849_relationships-in-submission 2019-07-26 10:01:50 +02:00
lotte
0d34152398 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-07-25 14:44:04 +02:00
Kristof De Langhe
cee7ffeb04 Merge branch 'master' into w2p-62741_Entities-grid-templates 2019-07-17 13:13:08 +02:00
lotte
42c690dfd4 moved search module contents to shared 2019-07-10 13:17:28 +02:00
lotte
37fd04593b 62355: replaced all method calls in templates (except for metadata values...) 2019-06-14 16:15:45 +02:00
Kristof De Langhe
47994f9557 62741: Entities grid templates tests 2019-06-07 15:18:38 +02:00
Kristof De Langhe
16bad82564 62741: Entities grid templates - publication, orgunit, person, project 2019-06-06 18:00:54 +02:00
lotte
8a32777802 finished webpack config for switching themes 2019-05-28 14:18:56 +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
Giuseppe Digilio
7c48504c82 renamed dspaceObject to indexableObject 2019-04-03 15:27:08 +02: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
lotte
8a9f57966f Fixed conflicts with new metadata map 2019-02-26 16:06:33 +01:00
Chris Wilper
4c8747a345 DS-4107 Improve TypeDocs 2019-02-14 14:46:27 -05:00
Chris Wilper
ea9ce6194c DS-4107 Update tests and mocks for metadata as map 2019-02-14 12:29:40 -05:00
Chris Wilper
2368df9513 DS-4107 Retrieve and model metadata as a map 2019-02-14 12:29:35 -05:00
lotte
9c3f226599 Merge branch 'master' into configurable_entities
Conflicts:
	src/app/+collection-page/collection-page.component.ts
	src/app/+item-page/full/full-item-page.component.ts
	src/app/+item-page/simple/item-page.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-results/search-results.component.spec.ts
	src/app/+search-page/search-results/search-results.component.ts
	src/app/+search-page/search-service/search-configuration.service.spec.ts
	src/app/+search-page/search-service/search-configuration.service.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/core/cache/builders/remote-data-build.service.spec.ts
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/core/data/data.service.ts
	src/app/core/metadata/metadata.service.ts
	src/app/core/shared/item.model.ts
	src/app/core/shared/operators.ts
	src/app/shared/loading/loading.component.ts
	src/app/shared/object-collection/object-collection.component.ts
	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.spec.ts
	src/app/shared/services/route.service.spec.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/testing/hal-endpoint-service-stub.ts
	src/app/shared/testing/search-service-stub.ts
	yarn.lock
2018-12-10 11:13:01 +01:00
Kristof De Langhe
addea8bf0e Merge branch 'master' into entities-master
Conflicts:
	src/app/+item-page/full/full-item-page.component.ts
	src/app/+item-page/simple/item-page.component.html
	src/app/+item-page/simple/item-page.component.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
	src/app/+search-page/search-filters/search-filter/search-filter.service.ts
	src/app/+search-page/search-options.model.ts
	src/app/+search-page/search-page.component.html
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search-results/search-results.component.ts
	src/app/+search-page/search-service/search.service.spec.ts
	src/app/+search-page/search-service/search.service.ts
	src/app/+search-page/search-settings/search-settings.component.ts
	src/app/core/cache/response-cache.models.ts
	src/app/core/core.module.ts
	src/app/core/data/search-response-parsing.service.ts
	src/app/core/shared/operators.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/object-collection/object-collection.component.spec.ts
	src/app/shared/object-collection/object-collection.component.ts
	src/app/shared/object-collection/shared/dso-element-decorator.spec.ts
	src/app/shared/object-collection/shared/dso-element-decorator.ts
	src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
	src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
	src/app/shared/object-grid/item-grid-element/item-grid-element.component.ts
	src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
	src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
	src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.ts
	src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.ts
	src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
	src/app/shared/object-list/community-list-element/community-list-element.component.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.ts
	src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
	src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.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.ts
	src/app/shared/object-list/wrapper-list-element/wrapper-list-element.component.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/testing/hal-endpoint-service-stub.ts
	src/app/shared/testing/search-service-stub.ts
	src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
	src/app/shared/view-mode-switch/view-mode-switch.component.ts
	src/app/thumbnail/thumbnail.component.html
2018-09-17 14:10:46 +02:00