Yury Bondarenko
dbf7fd67fd
Merge remote-tracking branch 'origin/main' into more-eslint
2024-03-06 10:26:07 +01:00
FrancescoMolinaro
47a907c1d2
Merge branch 'main' into coar-notify-7
2024-02-28 15:41:07 +01:00
Alisa Ismailati
8d0971d9ff
Merge branch 'main' into CST-12109-WITHDRAWN-REINSTATE-requests
2024-02-21 10:14:50 +01:00
Tim Donohue
eb433c8727
Merge pull request #1638 from 4Science/CST-5249_suggestion
...
Openaire suggestions (publication claim)
2024-02-15 10:24:31 -06:00
FrancescoMolinaro
47f1b843e4
Merge branch 'main' into coar-notify-7
2024-02-14 11:14:14 +01:00
FrancescoMolinaro
c09a6e819f
Merge branch 'main' into coar-notify-7
2024-02-13 12:52:33 +01:00
Alisa Ismailati
d72610f562
Merge branch 'main' into CST-12109-WITHDRAWN-REINSTATE-requests
2024-02-12 12:01:28 +01:00
Alexandre Vryghem
193d56d422
Merge branch 'refactor-comcol-pages_contribute-7.6' into refactor-comcol-pages_contribute-main
2024-02-09 23:25:49 +01:00
Alexandre Vryghem
d9759d1136
108588: Renamed components, because now these aren't page components anymore
2024-02-07 00:44:17 +01:00
Alexandre Vryghem
0483612819
108588: Moved CommunityPageSubCommunityListComponent & CommunityPageSubCollectionListComponent to a custom sections folder
2024-02-07 00:22:14 +01:00
Alisa Ismailati
3ecc1ca68b
Merge branch 'main' into CST-12109-WITHDRAWN-REINSTATE-requests
2024-01-17 16:02:21 +01:00
Alisa Ismailati
3ae430460f
fixed errors
2024-01-12 11:55:19 +01:00
frabacche
108db1e0c5
CST-5249_suggestion alignment to main, merge conflicts
2023-12-21 12:44:12 +01:00
Yury Bondarenko
544306af30
Merge remote-tracking branch 'origin/main' into more-eslint
2023-12-12 18:32:22 +01:00
Alexandre Vryghem
19384dfdb1
Merge remote-tracking branch 'upstream/main' into generify-component-loaders_contribute-7.6
...
# Conflicts:
# src/app/shared/shared.module.ts
2023-12-12 01:00:18 +01:00
Alexandre Vryghem
26e0bc81c7
Removed Themed components from PR 1842 because those should be themed using the decorator rendersBrowseBy(browseType, themeName) and fixed the components in the custom theme folder
...
- Removed ngOnDestroy from BrowseByTitlePageComponent because super.ngOnDestroy already included the unsubscribe functionality
- Removed BrowseBySwitcherComponent since a themed version of that isn't really useful
2023-12-11 01:02:24 +01:00
Stefano Maffei
4b7602fe7d
Merge remote-tracking branch 'originGithub/main' into coar-notify-7
...
# Conflicts:
# src/app/shared/shared.module.ts
# src/assets/i18n/en.json5
# src/modules/app/browser-init.service.ts
# src/themes/custom/lazy-theme.module.ts
2023-12-05 13:10:25 +01:00
Mykhaylo Boychuk
9094d8233f
[CST-12109] implemented withdrawn-reinstate requests
2023-11-01 14:29:26 +01:00
Mykhaylo
bf67fee89b
[CST-11178][CST-11179] page to select the target item for "relation" correction suggestion
2023-10-30 12:21:38 +01:00
Alexandre Vryghem
ab171648b6
New themed components & minor CSS fixes ( #2442 )
...
* 100839: Created themeable BrowseByComponent
* 100839: Added themed BrowseByComponent to custom theme
* 100839: Added themed BrowseEntryListElementComponent to custom theme
* Added PersonComponent to custom theme
* Themed LogInComponent
* Fix focus on navbar using different color
* Fix ccLicense checkbox margin
* Fix long search facets name not displaying correctly
* Removed RecentItemListComponent's unnecessary float causing alignment issues when adding components underneath it
* Themed RegisterEmailFormComponent
2023-10-26 16:04:44 -05:00
Francesco Bacchelli
9b556fd703
Merge branch CST-5249_suggestion of https://github.com/4Science/DSpace into CST-11299
2023-08-22 11:16:30 +02:00
Eike Martin Löhden
e3f57dae44
Included user-menu component in custom theme.
2023-07-10 15:54:09 +02:00
Yury Bondarenko
a11be65f95
ESlint: fix imports
2023-06-27 17:20:06 +02:00
Yury Bondarenko
917c36dbe7
ESLint: fix dangling commas
2023-06-27 17:19:58 +02:00
Yury Bondarenko
0690a201dc
ESLint: fix indentation
2023-06-27 17:19:55 +02:00
Tim Donohue
5d39026eb7
Merge pull request #2245 from mwoodiupui/themeable-request-copy
...
Make some request-copy components themeable.
2023-06-20 16:27:45 -05:00
Mark H. Wood
c63001c205
Fix illogical templateUrl paths. Add missed DenyRequestCopyComponent.
2023-06-16 16:08:18 -04:00
Nona Luypaert
9ca57e942a
Merge branch 'main' into w2p-101127_browse-by-controlled-vocabulary-7.6.0-next
...
Conflicts:
src/assets/i18n/en.json5
2023-06-03 00:07:37 +02:00
Mark H. Wood
10899aa22c
Merge branch 'main' into themeable-section-upload-file
2023-06-01 16:36:09 -04:00
Mark H. Wood
3a5d8022e5
Merge branch 'main' into themeable-request-copy
2023-06-01 13:58:07 -04:00
Mark H. Wood
dd548c20e9
Add blank custom versions to 'custom' theme.
2023-06-01 13:48:17 -04:00
Kristof De Langhe
48896fdae2
Merge branch 'main' into w2p-98422_Thumbnail-uploader_contribute-7.2
2023-06-01 17:14:32 +02:00
Nona Luypaert
d38b16eb48
Merge remote-tracking branch 'upstream/main' into w2p-101127_browse-by-controlled-vocabulary-7.6.0-next
...
Conflicts:
src/app/browse-by/browse-by-guard.spec.ts
src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
2023-05-24 17:26:53 +02:00
Nona Luypaert
fad1a7ade4
Merge branch 'w2p-101127_browse-by-controlled-vocabulary' into w2p-101127_browse-by-controlled-vocabulary-7.6.0-next
...
Conflicts:
src/app/browse-by/browse-by-routing.module.ts
src/app/browse-by/browse-by.module.ts
src/app/core/browse/browse-definition-data.service.ts
src/app/core/core.module.ts
2023-05-24 16:35:37 +02:00
Mark H. Wood
8a93bef98c
Supply a customizable themed version.
2023-05-23 13:06:12 -04:00
Alexandre Vryghem
053063d0f4
Merge remote-tracking branch 'upstream/main' into fix-ngonchanges-not-working-for-themed-components_contribute-main
...
# Conflicts:
# src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
# src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.html
# src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
# src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
# src/app/shared/shared.module.ts
# src/app/shared/theme-support/themed.component.ts
# src/themes/custom/lazy-theme.module.ts
2023-05-19 13:36:41 +02:00
Alexandre Vryghem
190f245635
Merge tag 'dspace-7.4' into fix-ngonchanges-not-working-for-themed-components_contribute-7.4
...
# Conflicts:
# src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
# src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
# src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.ts
# src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.ts
# src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
# src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
# src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
# src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
# src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
# src/app/shared/theme-support/themed.component.ts
# src/app/thumbnail/thumbnail.component.spec.ts
# src/app/thumbnail/thumbnail.component.ts
# src/themes/custom/lazy-theme.module.ts
2023-05-19 13:17:26 +02:00
Tim Donohue
4f4dbffde8
Merge pull request #2227 from 4Science/DURACOM-134
...
Administer workflow actions
2023-05-17 16:44:18 -05:00
Nona Luypaert
195ab41aac
101623: Themed BrowseByTaxonomyPageComponent
2023-05-10 13:39:57 +02:00
Alisa Ismailati
2895cfe083
[DURACOM-134] Administer workflow actions fixed
2023-04-28 18:03:52 +02:00
lotte
17782b80cd
Merge branch 'main' into w2p-97184_theme-feedback_contribute-main
2023-04-13 13:11:58 +02:00
Alexandre Vryghem
4f87bab78c
Merge remote-tracking branch 'alex/w2p-99465_themed-MediaViewerCompoent_contribute-7.2'
...
# Conflicts:
# src/themes/custom/lazy-theme.module.ts
2023-03-15 17:22:50 +01:00
Alexandre Vryghem
daca70e6cb
Merge remote-tracking branch 'atmire/issue-1833_entity-title-refactor_themed-ItemPageTitleFieldComponent-7.2'
...
# Conflicts:
# src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.html
# src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
# src/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
# src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
# src/app/entity-groups/research-entities/item-pages/person/person.component.html
# src/app/entity-groups/research-entities/item-pages/project/project.component.html
# src/app/item-page/full/full-item-page.component.html
# src/app/item-page/simple/item-types/publication/publication.component.html
# src/app/item-page/simple/item-types/untyped-item/untyped-item.component.html
# src/app/shared/shared.module.ts
# src/themes/custom/lazy-theme.module.ts
2023-03-15 17:15:05 +01:00
Alexandre Vryghem
06f95da018
Merge remote-tracking branch 'alex/w2p-100079_themed-feedback-form-component_contribute-7.2'
...
# Conflicts:
# src/themes/custom/lazy-theme.module.ts
2023-03-15 16:55:21 +01:00
Alexandre Vryghem
72dbb0fdef
Themed FeedbackFormComponent
2023-03-06 22:09:34 +01:00
lotte
c1a1d1a20e
Merge branch 'w2p-99521_themed-top-level-communities-component_contribute-main' into w2p-97184_theme-feedback_contribute-main
2023-02-23 11:07:29 +01:00
lotte
55fcab1700
Merge branch 'w2p-99521_themed-top-level-communities-component_contribute-7.4' into w2p-99521_themed-top-level-communities-component_contribute-main
2023-02-22 16:14:25 +01:00
lotte
efe1d1085a
Moved TopLevelCommunityComponent to Eager module
2023-02-22 16:12:40 +01:00
lotte
1c12977347
Merge branch 'w2p-99521_themed-top-level-communities-component_contribute-7.2' into w2p-99521_themed-top-level-communities-component_contribute-7.4
2023-02-22 16:08:36 +01:00
Alexandre Vryghem
64dd2e6344
Merge remote-tracking branch 'templates/w2p-91874_Authority-control_contribute-7.2' into atmire-contributions-alex-7.5
...
# Conflicts:
# src/app/shared/form/form.module.ts
# src/app/shared/shared.module.ts
# src/themes/custom/lazy-theme.module.ts
2023-02-22 13:52:38 +01:00
