Commit Graph

17 Commits

Author SHA1 Message Date
lotte
8a4405c473 Merge branch 'backport-4099-duplicate-view-events-7.6' into 4099-duplicate-view-events_contibute-7.6.3 2025-04-07 10:43:09 +02:00
lotte
01becae7d0 129694: backported view tracker resolver 2025-04-04 13:31:49 +02:00
Alexandre Vryghem
6988df519e Merge branch 'w2p-120109_fix-findByHref-and-findListByHref-skipping-their-response_contribute-7.6' into dspace-7_x
# Conflicts:
#	src/app/core/data/base/base-data.service.spec.ts
#	src/app/core/data/base/base-data.service.ts
#	src/app/item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
2024-12-05 23:49:13 +01:00
Alexandre Vryghem
ce17d23c08 120109: Updated the route configuration to only resolve the dsoEditMenuResolver on pages who use the DsoEditMenuComponent
(cherry picked from commit 5c9f494f76)
2024-12-05 23:27:55 +01:00
Alexandre Vryghem
7d49666865 Merge remote-tracking branch 'alex/w2p-112970_added-missing-breadcrumbs_contribute-7.4' into dspace-7_x
# Conflicts:
#	src/app/collection-page/collection-page-routing.module.ts
#	src/app/community-page/community-page-routing.module.ts
#	src/app/core/core.module.ts
#	src/app/workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
#	src/app/workspaceitems-edit-page/workspaceitems-edit-page-routing.module.ts
#	src/assets/i18n/en.json5
2024-04-22 16:23:48 +02:00
Alexandre Vryghem
4251630ab8 112970: Always rerun resolvers on url change for create comcol pages 2024-04-11 00:18:04 +02:00
Alexandre Vryghem
692bb991a0 112970: Added missing breadcrumbs to create community/collection pages 2024-03-19 12:06:39 +01:00
Yana De Pauw
419cb947d9 Merge remote-tracking branch 'upstream/main' into w2p-94390_replace-dso-page-edit-buttons-with-a-menu 2023-01-13 14:35:35 +01:00
Jens Vannerum
26d4be6101 Merge branch 'w2p-97265_fix-statistics-menu-order' into w2p-97265_fix-statistics-menu-order-7.4 2022-12-06 18:04:16 +01:00
Jens Vannerum
fcdc4b2b63 97265: Fix statistics header bug 2022-12-06 17:55:23 +01:00
Yana De Pauw
7f91f50e63 Merge remote-tracking branch 'upstream/main' into w2p-94390_replace-dso-page-edit-buttons-with-a-menu 2022-09-22 16:08:53 +02:00
Yana De Pauw
96ba1c9319 94390: Implement feedback 2022-09-21 16:16:56 +02:00
Yana De Pauw
878db5be75 94390: Replace DSO page edit buttons with a menu 2022-09-21 16:16:44 +02:00
lotte
143b7c3e0d 87382: fixing circular dependencies 2022-02-16 13:52:32 +01:00
Art Lowel
124845bee1 update folder structure based on style guide 2021-07-23 17:18:51 +02:00
William Welling
3d02e660da fixed core and shared module usage, lazy loading modules 2017-09-26 11:44:07 -05:00
Christian Scheible
48c3cb4e46 #89 added community home page 2017-06-09 15:04:48 +02:00