Eike Martin Löhden
|
e3f57dae44
|
Included user-menu component in custom theme.
|
2023-07-10 15:54:09 +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 |
|
Alexandre Vryghem
|
74ca23ec83
|
Merge branch 'w2p-98661_themed-FullFileSectionComponent-contribute-7.2' into atmire-contributions-alex-7.5
# Conflicts:
# src/app/item-page/full/full-item-page.component.html
# src/app/item-page/item-page.module.ts
# src/themes/custom/lazy-theme.module.ts
|
2023-02-22 13:29:44 +01:00 |
|
Alexandre Vryghem
|
008e089e62
|
Merge remote-tracking branch 'upstream/main' into atmire-contributions-alex-7.5
# Conflicts:
# src/app/item-page/item-page.module.ts
# src/app/shared/search/themed-search.component.ts
# src/app/shared/shared.module.ts
# src/themes/custom/eager-theme.module.ts
# src/themes/custom/lazy-theme.module.ts
|
2023-02-18 13:19:08 +01:00 |
|
Yana De Pauw
|
131eaef469
|
Merge remote-tracking branch 'upstream/main' into w2p-94390_replace-dso-page-edit-buttons-with-a-menu
|
2023-02-10 12:05:21 +01:00 |
|
Yana De Pauw
|
0076edd026
|
Merge remote-tracking branch 'upstream/main' into w2p-97425_System-wide-alerts
|
2023-02-09 11:57:25 +01:00 |
|
lotte
|
458fe3c680
|
Merge remote-tracking branch 'origin/main' into w2p-97184_theme-feedback_contribute-main
|
2023-02-09 11:23:33 +01:00 |
|
Alexandre Vryghem
|
7edc1c1036
|
Merge branch 'w2p-94688_added-themeable-search-form-component' into atmire-contributions-alex-7.5
|
2023-02-08 23:04:52 +01:00 |
|
Alexandre Vryghem
|
b1077dad31
|
Merge remote-tracking branch 'templates/w2p-97729_themed-ItemAlertsComponent_contribute-7.4' into atmire-contributions-alex-7.5
# Conflicts:
# src/app/item-page/alerts/themed-item-alerts.component.ts
# src/app/shared/shared.module.ts
# src/themes/custom/lazy-theme.module.ts
|
2023-02-08 22:56:08 +01:00 |
|
Yana De Pauw
|
d56497edfa
|
Merge remote-tracking branch 'upstream/main' into w2p-94390_replace-dso-page-edit-buttons-with-a-menu
|
2023-02-06 11:00:55 +01:00 |
|
Yana De Pauw
|
b4b927e2d8
|
Merge remote-tracking branch 'upstream/main' into w2p-97425_System-wide-alerts
|
2023-02-02 17:14:19 +01:00 |
|
lotte
|
3faf244259
|
Merge branch 'main' into w2p-97184_theme-feedback_contribute-main
|
2023-02-02 14:35:13 +01:00 |
|
lotte
|
99e83b3e70
|
Merge branch 'w2p-97184_theme-feedback_contribute-7.4' into w2p-97184_theme-feedback_contribute-main
|
2023-01-24 18:18:35 +01:00 |
|
lotte
|
3a2f15d1ef
|
Fixed issues with badges and moved access status into ds-badges
|
2023-01-24 18:13:50 +01:00 |
|
Kristof De Langhe
|
1f7d7618d5
|
Merge branch 'main' into edit-metadata-redesign-PR
|
2023-01-24 16:18:46 +01:00 |
|
lotte
|
eccd67d131
|
Merge branch 'w2p-97184_theme-feedback_contribute-7.2' into w2p-97184_theme-feedback_contribute-7.4
|
2023-01-24 13:47:35 +01:00 |
|
Yana De Pauw
|
45248b4ee8
|
Merge remote-tracking branch 'upstream/main' into w2p-97425_System-wide-alerts
|
2023-01-24 10:25:58 +01:00 |
|
lotte
|
69342e7f69
|
Merge branch 'w2p-97184_theme-feedback_contribute-7.2' into w2p-97184_theme-feedback_contribute-7.4
|
2023-01-23 16:58:52 +01:00 |
|
lotte
|
7abcea1d03
|
Merge branch 'w2p-97184_theme-feedback_contribute-7.4' into w2p-97184_theme-feedback_contribute-main
|
2023-01-23 12:54:14 +01:00 |
|
lotte
|
5351ba6c55
|
Merge branch 'dspace-7.4' into w2p-97184_theme-feedback_contribute-7.4
|
2023-01-23 12:46:38 +01:00 |
|
Michael W Spalti
|
52163b30b8
|
Added component to custom theme's lazy-theme.module
|
2023-01-21 13:23:17 -08:00 |
|
Michael W Spalti
|
055787ee55
|
Merge branch 'main' into item-back-button
|
2023-01-13 10:17:03 -08:00 |
|
Yana De Pauw
|
e2087ad952
|
Fix merge issues
|
2023-01-13 14:35:40 +01:00 |
|
Kristof De Langhe
|
953213ac4f
|
Merge branch 'main' into edit-metadata-redesign-PR
|
2023-01-12 17:02:09 +01:00 |
|
Kristof De Langhe
|
35a9e7cdc9
|
Merge remote-tracking branch 'dspace/main' into w2p-98422_Thumbnail-uploader_contribute-7.2
|
2023-01-11 15:03:27 +01:00 |
|
lotte
|
e135b014be
|
Merge branch 'main' into w2p-97184_theme-feedback_contribute-7.2
|
2023-01-11 10:56:11 +01:00 |
|