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 |
|
Alexandre Vryghem
|
a36b57661f
|
Merge branch 'w2p-98211_advanced-workflow-actions-7.2' into w2p-98211_advanced-workflow-actions-main
# Conflicts:
# src/app/core/core.module.ts
# src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
|
2023-01-18 13:52:25 +01:00 |
|
Alexandre Vryghem
|
572f5ac4c5
|
98535: Added missing tests to the new advanced workflow components
|
2023-01-18 13:45:04 +01:00 |
|
Alexandre Vryghem
|
fe61bb7b6b
|
98535: Cleaned up code & added documentation
|
2023-01-18 12:27:06 +01:00 |
|
kshepherd
|
105e4b6c13
|
Merge pull request #2045 from atmire/clean-angular-cli-cache-7.4
Add a yarn clean script for the .angular/cache folder
|
2023-01-18 10:35:10 +13:00 |
|
Art Lowel
|
ace396a31f
|
add yarn clean script for the .angular/cache folder
|
2023-01-17 17:23:29 +01:00 |
|
Koen Pauwels
|
f13b67e8ad
|
97732 Fix linter issues
|
2023-01-16 18:11:40 +01:00 |
|
Koen Pauwels
|
711e2e1e7c
|
97732 Fix linter issues
|
2023-01-16 18:07:39 +01:00 |
|
Koen Pauwels
|
2ff8664b0f
|
97732 Fix linter issues
|
2023-01-16 17:56:09 +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 |
|
Koen Pauwels
|
e5cc565327
|
97732 Fix flaky test for ContextHelpToggleComponent
|
2023-01-16 14:27:56 +01:00 |
|
Koen Pauwels
|
950952383c
|
97732 Fix flaky test for ContextHelpToggleComponent
|
2023-01-16 14:14:02 +01:00 |
|
Koen Pauwels
|
b38e1e0367
|
97732 Fix flaky test for ContextHelpToggleComponent
|
2023-01-16 14:13:01 +01:00 |
|
aroman-arvo
|
6523b02913
|
DS-8408: Edit item is ordered by relevance
|
2023-01-16 13:09:05 +01:00 |
|
Koen Pauwels
|
98f8aaf30c
|
Merge branch 'feature-context-help-7.4' into w2p-97732_feature-context-help-service
|
2023-01-16 12:24:29 +01:00 |
|
Koen Pauwels
|
fd080c2366
|
Merge branch 'feature-context-help-7.2' into feature-context-help-7.4
|
2023-01-16 12:24:05 +01:00 |
|
Koen Pauwels
|
bed14c6b06
|
97732 ContextHelpWrapper: changed tooltip link color
|
2023-01-16 12:23:12 +01:00 |
|
Koen Pauwels
|
12dd605706
|
Merge branch 'feature-context-help-7.2' into feature-context-help-7.4
|
2023-01-16 11:39:10 +01:00 |
|
Koen Pauwels
|
04f4d74ed0
|
Merge branch 'feature-context-help-7.4' into w2p-97732_feature-context-help-service
|
2023-01-16 11:38:05 +01:00 |
|
Koen Pauwels
|
0cdf4b9c3e
|
Merge branch 'feature-context-help-7.2' into feature-context-help-7.4
|
2023-01-16 11:11:33 +01:00 |
|
Koen Pauwels
|
7812eecb53
|
97732 Fix linter issues
|
2023-01-16 11:07:47 +01:00 |
|
Koen Pauwels
|
f170d751c9
|
Merge branch 'feature-context-help-7.4' into w2p-97732_feature-context-help-service
|
2023-01-16 10:37:53 +01:00 |
|
Koen Pauwels
|
674fb24115
|
Merge branch 'feature-context-help-7.2' into feature-context-help-7.4
|
2023-01-16 10:26:00 +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 |
|
Jens Vannerum
|
e40cd20287
|
97049: Disable the vocabulary by default
|
2023-01-16 09:55:52 +01:00 |
|
Adán Román Ruiz
|
4e0a0a0105
|
Merge branch 'DSpace:main' into DS-8408
|
2023-01-16 09:54:22 +01:00 |
|
Koen Pauwels
|
bcbfafcb32
|
97732 Context help button now disabled when there are no tooltips available on the page
|
2023-01-16 09:36:57 +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 |
|
Giuseppe
|
5aa9d3d29d
|
Merge branch 'main' into CST-7217
|
2023-01-16 09:06:07 +01:00 |
|
Michael W Spalti
|
624e059a4c
|
Merge branch 'main' into fix-login-menu
|
2023-01-13 12:12:55 -08:00 |
|
Michael W Spalti
|
055787ee55
|
Merge branch 'main' into item-back-button
|
2023-01-13 10:17:03 -08:00 |
|
Koen Pauwels
|
6bee69bc3f
|
97732 Completed ContextHelpWrapper tests
|
2023-01-13 15:45:54 +01: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 |
|
Koen Pauwels
|
84c8b7690a
|
97732 ContextHelpToggleComponent tests
|
2023-01-13 14:05:33 +01:00 |
|
Koen Pauwels
|
f7787d74bc
|
97732 Tests for ContextHelpService
|
2023-01-13 12:28:41 +01:00 |
|
Jens Vannerum
|
e0cadec2c2
|
97049: Group keys together
|
2023-01-13 12:14:43 +01:00 |
|
jensvannerum
|
065d816b3d
|
Merge branch 'main' into issue-815-controlled-vocabulary-hierarchical-facets-7.4
|
2023-01-13 11:33:04 +01:00 |
|
Michael Spalti
|
99ada45288
|
removed unused property
|
2023-01-12 18:46:57 -08:00 |
|
Michael Spalti
|
0fe9665026
|
removed code repetition
|
2023-01-12 18:42:59 -08:00 |
|
Tim Donohue
|
7a82b08ba7
|
Merge pull request #1949 from 4Science/CST-7392
Login menu refactoring
|
2023-01-12 14:51:40 -06:00 |
|
Tim Donohue
|
ee560d297a
|
Merge pull request #2006 from mwoodiupui/2005
Catch and report errors from non-JSON responses to authentication requests.
|
2023-01-12 10:32:17 -06:00 |
|
Kristof De Langhe
|
9b9d9518c5
|
Merge branch 'main' into w2p-97287_Duplicate-GA-page-view-fix
|
2023-01-12 17:06:19 +01:00 |
|
Kristof De Langhe
|
1062dc4341
|
97287: Remove unused import
|
2023-01-12 17:06:15 +01:00 |
|
Kristof De Langhe
|
953213ac4f
|
Merge branch 'main' into edit-metadata-redesign-PR
|
2023-01-12 17:02:09 +01:00 |
|
Davide Negretti
|
0dd6333e05
|
[CST-7392] [DSC-773] login menu refactoring
|
2023-01-12 15:52:22 +01:00 |
|
Sufiyan Shaikh
|
4d2522a69a
|
[CST-7755] Build Failded Fixed
|
2023-01-12 19:00:44 +05:30 |
|
corrado lombardi
|
697407a71c
|
Merge branch 'CST-7755' of github.com:4Science/dspace-angular into CST-7755
|
2023-01-12 12:35:56 +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 |
|