Commit Graph

9215 Commits

Author SHA1 Message Date
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
Tim Donohue
793bed30bc Merge pull request #1973 from 4Science/CST-7604
Restored highlighting of title in search results
2023-01-11 16:36:46 -06:00
Michael Spalti
65af3973ba fixed lint error 2023-01-11 12:03:19 -08:00
Alexandre Vryghem
f1bc30c695 Merge branch 'w2p-98211_advanced-workflow-actions-7.2' into w2p-98211_advanced-workflow-actions-main 2023-01-11 20:53:50 +01:00
Michael Spalti
357525e68a Ignore IP authentication method in login component.
lint fix

using enum

Simplified assignment.
2023-01-11 11:53:39 -08:00
Marie Verdonck
bd2135bcd2 98376: scoreReview workflow - slight refactor REST changes 2023-01-11 20:52:52 +01:00
Alexandre Vryghem
6acbb7ec0e Merge branch 'w2p-98211_advanced-workflow-actions-7.2' into w2p-98211_advanced-workflow-actions-main
# Conflicts:
#	src/app/access-control/access-control.module.ts
#	src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.spec.ts
#	src/app/access-control/group-registry/group-form/eperson-list/eperson-list.component.ts
#	src/app/access-control/group-registry/group-form/members-list/members-list.component.ts
#	src/assets/i18n/en.json5
2023-01-11 20:40:40 +01:00
Alexandre Vryghem
11b6ec9a9e 98376: Replaced EPersonListComponent with MembersListComponent & display error for empty reviewers list 2023-01-11 20:28:54 +01:00
Tim Donohue
bbdef724e8 Merge pull request #2038 from tdonohue/datacite_i18n_key
Add DataCite to i18n list of sources
2023-01-11 13:13:30 -06:00
Tim Donohue
6396e6a585 Add DataCite to i18n list of sources 2023-01-11 12:33:26 -06:00
Adán Román Ruiz
f790d29355 Merge branch 'main' into DS-8408 2023-01-11 19:13:54 +01:00
Alexandre Vryghem
cd0019eb8a Merge branch 'main-upstream' into w2p-98211_advanced-workflow-actions 2023-01-11 18:24:30 +01:00