Commit Graph

366 Commits

Author SHA1 Message Date
FrancescoMolinaro
5eb2405a68 resolve conflicts after main alignment 2024-02-28 17:58:24 +01:00
Alisa Ismailati
8d0971d9ff Merge branch 'main' into CST-12109-WITHDRAWN-REINSTATE-requests 2024-02-21 10:14:50 +01:00
frabacche
afa6559b19 CST-5249_suggestion refactor deleting 'reciter', docs 2024-01-24 18:32:21 +01:00
Alisa Ismailati
3ecc1ca68b Merge branch 'main' into CST-12109-WITHDRAWN-REINSTATE-requests 2024-01-17 16:02:21 +01:00
frabacche
108db1e0c5 CST-5249_suggestion alignment to main, merge conflicts 2023-12-21 12:44:12 +01:00
FrancescoMolinaro
922172d9ae refactor, improve code according to suggestions 2023-12-13 11:55:10 +01:00
Mykhaylo Boychuk
9094d8233f [CST-12109] implemented withdrawn-reinstate requests 2023-11-01 14:29:26 +01:00
Mykhaylo
752cb4d4b0 [CST-11178] show allowed correction types 2023-10-30 12:19:44 +01:00
Francesco Bacchelli
9b556fd703 Merge branch CST-5249_suggestion of https://github.com/4Science/DSpace into CST-11299 2023-08-22 11:16:30 +02:00
Francesco Bacchelli
37121b001b Merge branch 'main' of https://github.com/DSpace/dspace-angular into CST-11298 2023-08-01 15:51:02 +02:00
Enea Jahollari
9f78f6c5c1 Merge branch 'main' into feature/CST-9636
# Conflicts:
#	src/app/core/core.module.ts
2023-06-07 16:11:43 +02:00
Nona Luypaert
d38b16eb48 Merge remote-tracking branch 'upstream/main' into w2p-101127_browse-by-controlled-vocabulary-7.6.0-next
Conflicts:
	src/app/browse-by/browse-by-guard.spec.ts
	src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
	src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
2023-05-24 17:26:53 +02:00
Nona Luypaert
fad1a7ade4 Merge branch 'w2p-101127_browse-by-controlled-vocabulary' into w2p-101127_browse-by-controlled-vocabulary-7.6.0-next
Conflicts:
	src/app/browse-by/browse-by-routing.module.ts
	src/app/browse-by/browse-by.module.ts
	src/app/core/browse/browse-definition-data.service.ts
	src/app/core/core.module.ts
2023-05-24 16:35:37 +02:00
Nona Luypaert
bf31c76c88 101623: Add ValueListBrowseDefinition model + super NonHierarchicalBrowse class 2023-05-19 16:56:07 +02:00
Art Lowel
3d7e61f57f add a custom FindDataImpl for browsedefinitions 2023-05-17 18:31:46 +02:00
Enea Jahollari
691c6ff2d8 Merge branch 'main' into feature/CST-9636
# Conflicts:
#	src/app/core/shared/context.model.ts
2023-05-15 14:31:03 +02:00
Nona Luypaert
f3d4754d5b 101623: Add BrowseDefinitionModels to CoreModule, Fix FlatBrowseDefinition 2023-05-12 10:06:03 +02:00
Giuseppe Digilio
b279b97c37 [CST-9636] WIP Fix bulk-access-config-data.service 2023-05-10 16:23:27 +02:00
Nona Luypaert
c10e660e0b 101623: Refactor BrowseDefinition model/resource-type to FlatBrowseDefinition 2023-05-10 10:11:06 +02:00
LotteHofstede
cc86ac5086 Merge branch 'main' into w2p-97184_theme-feedback_contribute-main 2023-04-20 10:47:04 +02:00
Tim Donohue
3e02f22f47 Add missing export for ItemRequest module 2023-04-18 11:20:20 -05:00
lotte
c1a1d1a20e Merge branch 'w2p-99521_themed-top-level-communities-component_contribute-main' into w2p-97184_theme-feedback_contribute-main 2023-02-23 11:07:29 +01:00
Giuseppe Digilio
6a0c1a978c Merge branch 'main' into CST-7755-refactoring
# Conflicts:
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
2023-02-13 21:36:30 +01:00
Giuseppe Digilio
cf0db54011 Merge branch 'main' into CST-7755-refactoring
# Conflicts:
#	src/app/shared/shared.module.ts
2023-02-13 10:09:17 +01:00
Davide Negretti
d65c12ae04 Merge branch 'main-gh4s' into CST-7757
# Conflicts:
#	src/app/collection-page/collection-page.component.html
#	src/app/community-page/community-page.component.html
#	src/app/core/core.module.ts
#	src/app/core/data/feature-authorization/feature-id.ts
#	src/app/shared/shared.module.ts
2023-02-11 03:17:44 +01:00
Marie Verdonck
53cb013b81 Merge branch 'main' into w2p-98211_advanced-workflow-actions-main
# Conflicts:
#	src/app/shared/shared.module.ts
2023-02-10 19:57:25 +01:00
Giuseppe Digilio
7a9f4efa95 Merge branch 'main' into CST-7755-refactoring
# Conflicts:
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
2023-02-10 19:52:55 +01:00
Kim Shepherd
21c9ef4ea2 [TLC-249] Ensure identifier data model mapped to type 2023-02-07 17:03:48 +13:00
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
Giuseppe Digilio
ad9bdd6e45 Merge branch 'main' into CST-5337
# Conflicts:
#	src/assets/i18n/en.json5
2023-01-20 08:29:28 +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
fe61bb7b6b 98535: Cleaned up code & added documentation 2023-01-18 12:27:06 +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
1cf0f97121 98211: Added advanced workflow models 2023-01-04 22:25:03 +01:00
Sufiyan Shaikh
09781c9057 [CST-7755] LYRASIS: Supervisor orders (Angular) 2022-12-29 18:16:54 +05:30
Rezart Vata
b775cd5ab0 [CST-7757] Subscriptions porting (wip) 2022-12-22 17:11:18 +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
db3e8f9246 96252: Extract upload-specific code from SharedModule 2022-12-08 16:12:24 +01:00
Yury Bondarenko
8341882b0f 96252: Extract form-specific code from SharedModule 2022-12-08 16:12:14 +01:00
Luca Giamminonni
50f74cdaf7 Merge remote-tracking branch '4Science-bitbucket/main' into CST-5337 2022-11-09 12:04:55 +01:00
Art Lowel
af98247195 add check to ensure document.styleSheets is defined 2022-09-22 18:18:42 +02:00
lotte
08577f5f17 Merge branch 'main' into w2p-94233_use-css-vars-in-CSSVariableService 2022-09-22 16:50:52 +02:00
lotte
f70fc7b87a 94233: use actual CSS variables in theme 2022-09-12 17:42:37 +02:00
Yura Bondarenko
fbaab69121 93803: Ensure data services are called *DataService 2022-08-25 10:28:45 +02:00
Yura Bondarenko
42a2c3c7e2 93803: Refactor existing data services 2022-08-24 19:03:19 +02:00
Luca Giamminonni
4a996b492a [CST-5249] Renamed notifications module to suggestion-notifications 2022-07-06 17:57:17 +02:00
Luca Giamminonni
d5c1b11d77 [CST-5337] Replace Notifications broker with Quality assurance 2022-07-06 17:04:11 +02:00
Luca Giamminonni
df93058881 Merge remote-tracking branch '4Science-bitbucket/main' into CST-5337 2022-07-06 16:39:38 +02:00