1
0
Commit Graph

44 Commits

Author SHA1 Message Date
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
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
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
Kristof De Langhe
1f7d7618d5 Merge branch 'main' into edit-metadata-redesign-PR 2023-01-24 16:18:46 +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
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
Yana De Pauw
3daec441f2 Merge remote-tracking branch 'upstream/main' into w2p-97425_System-wide-alerts 2023-01-06 10:04:35 +01:00
Kristof De Langhe
21eae60abb Merge branch 'main' into edit-metadata-redesign-PR 2023-01-05 11:40:10 +01:00
Kristof De Langhe
30eba0bdef 97742: Themed DsoEditMetadataComponent 2023-01-05 11:37:46 +01:00
Kristof De Langhe
124469209a 97742: Post merge test & build fixes 2023-01-04 17:51:34 +01:00
Yury Bondarenko
76108e57b3 Merge remote-tracking branch 'origin/main' into w2p-96252_Reduce-main-bundle-size_Reorganize-shared-module-pt2 2023-01-04 12:26:08 +01:00
Yury Bondarenko
661ed72c11 96252: Move Item page components out of SharedModule 2023-01-03 17:03:19 +01:00
Yana De Pauw
37ec888b0a 97425: Create "System Wide Alerts" feature 2022-12-23 10:51:53 +01:00
Michael Spalti
e963629d53 Renamed directory. 2022-12-21 12:29:09 -08:00
Michael Spalti
09e31e758d New modules for back button and browse-by 2022-12-21 12:02:56 -08:00
Alexandre Vryghem
2451bbbd34 97729: Themed ItemAlertsComponent 2022-12-21 14:48:14 +01:00
Alexandre Vryghem
ba15b28c7c 94688: Added themeable template of SearchFormComponent 2022-12-01 10:28:15 +01:00
Jens Vannerum
02499f8019 96062: Theme the ExternalSourceEntryImportModalComponent 2022-10-31 19:42:07 +01:00
Peter Wolfersberger
81830bb797 Fixed comma in lazy-theme.module.ts 2022-09-29 11:48:59 +02:00
Peter Wolfersberger
3799ed28c1 Made browse-by-metadata-page.component, browse-by-title-page.component, browse-by-date-page.component themeable
and fixed a forgotten "implements OnDestroy" in browse-by-metadata-page.component.ts
2022-09-29 10:49:42 +02:00
Peter Wolfersberger
48c3fd24ed Themed object-list.component. 2022-09-29 10:49:42 +02:00
Peter Wolfersberger
24943b9b09 Added already themed comcol-page-browse-by.component to custom theme. 2022-09-29 10:49:42 +02:00
Peter Wolfersberger
b0d1a74128 Made comcol-page-handle-component themeable 2022-09-29 10:49:02 +02:00
Jens Vannerum
27af7fad94 Merge branch 'main' into w2p-89685_themed-search-settings-component
# Conflicts:
#	src/themes/custom/lazy-theme.module.ts
2022-09-28 08:21:12 +02:00
Jens Vannerum
f84e4d6146 89685: Resolve wrong directory 2022-09-19 12:37:46 +02:00
Jens Vannerum
898f23a997 Merge branch 'main' into w2p-89685_themed-search-settings-component
# Conflicts:
#	src/app/shared/search/search.module.ts
#	src/themes/custom/lazy-theme.module.ts
2022-09-19 11:20:51 +02:00
Michael Spalti
7afa4dcd8d New themable components 2022-08-04 11:21:14 -07:00
Alexandre Vryghem
541968fdd9 Merge remote-tracking branch 'templates/w2p-89721_Add-themeable-components_contribute-7.2' into w2p-91272_Add-themed-components-to-upstream-branch 2022-06-02 17:14:44 +02:00
Alexandre Vryghem
9e8071727d Merge branch 'main-upstream' into w2p-91272_Add-themed-components-to-upstream-branch 2022-06-02 12:09:51 +02:00
Yura Bondarenko
c0f8dd078b 90978: Explain dsBrowserPipe more thoroughly 2022-05-05 11:33:51 +02:00
Yura Bondarenko
1522c36ed0 Merge remote-tracking branch 'origin/main' into w2p-90978_Improve-initial-page-load_PR 2022-04-28 13:49:39 +02:00
Yura Bondarenko
e65b5e2f1c 90978: Update theme modules 2022-04-28 12:16:46 +02:00