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 |
|
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 |
|
lotte
|
a475fa10be
|
Fixed more tests and imports
|
2023-01-24 13:28:02 +01:00 |
|
lotte
|
906c26bbe4
|
Revert "Made ListableObjectComponentLoaderComponent themeable"
This reverts commit a4679ca7
|
2023-01-24 09:51:33 +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
|
85562679a2
|
Refactored item list badges
|
2023-01-23 16:54:16 +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 |
|
lotte
|
a4679ca7e5
|
Made ListableObjectComponentLoaderComponent themeable
|
2023-01-23 12:33:01 +01:00 |
|
Alexandre Vryghem
|
8844b1b2c3
|
Merge remote-tracking branch 'upstream/main' into w2p-98211_advanced-workflow-actions-main
# Conflicts:
# src/app/shared/shared.module.ts
|
2023-01-18 13:54:31 +01:00 |
|
Koen Pauwels
|
bbdb964923
|
Merge remote-tracking branch 'dspace/main' into w2p-97732_feature-context-help-service
|
2023-01-16 15:58:05 +01:00 |
|
Giuseppe Digilio
|
5a71b0cfac
|
Merge branch 'main' into CST-7755
|
2023-01-16 10:13:46 +01:00 |
|
Giuseppe Digilio
|
28351f2ac7
|
[CST-7757] Fix merge with main
|
2023-01-16 09:55:56 +01:00 |
|
Giuseppe Digilio
|
1cc03f4b86
|
Merge branch 'main' into CST-7757
# Conflicts:
# src/app/shared/shared.module.ts
|
2023-01-16 09:19:01 +01: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 |
|
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 |
|
Davide Negretti
|
0dd6333e05
|
[CST-7392] [DSC-773] login menu refactoring
|
2023-01-12 15:52:22 +01:00 |
|
corrado lombardi
|
c9ad080c04
|
Merge branch 'main' into CST-7755
# Conflicts:
# src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
# src/app/shared/shared.module.ts
|
2023-01-12 12:26:45 +01:00 |
|
Alexandre Vryghem
|
cd0019eb8a
|
Merge branch 'main-upstream' into w2p-98211_advanced-workflow-actions
|
2023-01-11 18:24:30 +01:00 |
|
Alexandre Vryghem
|
7cee2aac6f
|
98376: Added rating button to ratingreviewaction claimed task and created page
|
2023-01-11 12:40:54 +01:00 |
|
Alexandre Vryghem
|
f4a303f808
|
98344: Added decline task simple workflow step
|
2023-01-09 23:20:14 +01:00 |
|
Koen Pauwels
|
72fb37f4c5
|
Merge remote-tracking branch 'dspace/main' into w2p-97732_feature-context-help-service
|
2023-01-06 11:38:40 +01:00 |
|
Koen Pauwels
|
0676b5aebb
|
Merge tag 'dspace-7.4' into feature-context-help-7.4
|
2023-01-06 11:13:41 +01:00 |
|
Alexandre Vryghem
|
0fb9970734
|
98211: Added button to my workflow task page
|
2023-01-04 22:48:45 +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
|
f6db75f4f8
|
96252: Remove unneeded imports from SharedModule
These are no longer required in SharedModule, so we can remove them from main.js
|
2023-01-03 17:05:36 +01:00 |
|
Yury Bondarenko
|
67616a5d52
|
96252: Remove unused sidebar filter components
|
2023-01-03 17:03:46 +01:00 |
|
Yury Bondarenko
|
1c7108e928
|
96252: Move MyDSpace components out of SharedModule
Also move ds-metadata-field-wrapper to SharedModule so it can be reused in detail view without importing ItemSharedModule
|
2023-01-03 17:03:42 +01:00 |
|
Yury Bondarenko
|
935e9a4690
|
96252: Move Bitstream page components out of SharedModule
|
2023-01-03 17:03:32 +01:00 |
|
Yury Bondarenko
|
661ed72c11
|
96252: Move Item page components out of SharedModule
|
2023-01-03 17:03:19 +01:00 |
|
Sufiyan Shaikh
|
2069bc20a2
|
[CST-7755] merge with latest main branch
|
2022-12-29 18:20:19 +05:30 |
|
Sufiyan Shaikh
|
09781c9057
|
[CST-7755] LYRASIS: Supervisor orders (Angular)
|
2022-12-29 18:16:54 +05:30 |
|
Giuseppe Digilio
|
af0b7e72b4
|
Merge branch 'main' into CST-7757
# Conflicts:
# src/app/shared/shared.module.ts
|
2022-12-27 09:42:28 +01:00 |
|
Rezart Vata
|
b775cd5ab0
|
[CST-7757] Subscriptions porting (wip)
|
2022-12-22 17:11:18 +01:00 |
|
Michael Spalti
|
6a1f81280b
|
Finished removing results button from shared.module
|
2022-12-21 12:54:31 -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 |
|
Michael Spalti
|
73a9e0b0bb
|
Apply shared button component to browse-by.
|
2022-12-20 13:46:59 -08:00 |
|
Michael Spalti
|
d34cea1215
|
Fixed module.
|
2022-12-19 13:01:53 -08:00 |
|
Michael Spalti
|
7eb446a84f
|
Merge branch 'main' into item-back-button
|
2022-12-19 12:54:59 -08:00 |
|
Michael Spalti
|
d029e80495
|
Convert to themed, shared component
|
2022-12-19 12:32:53 -08:00 |
|
Koen Pauwels
|
28a127ca0e
|
97399 Improvements to ContextHelpDirective and ContextHelpWrapperComponent
|
2022-12-16 16:50:17 +01:00 |
|
Koen Pauwels
|
a40d93a941
|
97399 Implemented basic working tooltip on top level community list
|
2022-12-16 11:41:09 +01:00 |
|
Jens Vannerum
|
f2972d7d34
|
Merge remote-tracking branch 'dspace-main/main' into w2p-96062_theme-collection-dropdown-component
# Conflicts:
# src/app/shared/shared.module.ts
|
2022-12-15 17:58:28 +01:00 |
|
Yury Bondarenko
|
2ffd732a40
|
Merge remote-tracking branch 'origin/main' into w2p-96252_Reduce-main-bundle-size_Reorganize-shared-module_REBASE-ON-7.4
|
2022-12-08 16:19:41 +01:00 |
|
Yury Bondarenko
|
d0c74ed49f
|
96252: Clean up SharedModule & CoreModule
|
2022-12-08 16:12:30 +01:00 |
|
Yury Bondarenko
|
9e731909ae
|
96252: Move menu support code to MenuModule
|
2022-12-08 16:12:27 +01:00 |
|
Yury Bondarenko
|
db3e8f9246
|
96252: Extract upload-specific code from SharedModule
|
2022-12-08 16:12:24 +01:00 |
|