hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,516 Commits 23 Branches 25 Tags
dd7f34e5414157eb4afc326e55c1c79aced8f2fb
Commit Graph

263 Commits

Author SHA1 Message Date
Kristof De Langhe
dd7f34e541 Merge branch 'main' into w2p-71764_Features-support-part-2 
Conflicts:
	src/app/+collection-page/collection-page-routing.module.ts
	src/app/+community-page/community-page-routing.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+item-page/edit-item-page/item-status/item-status.component.ts
	src/app/+item-page/item-page-routing.module.ts
	src/app/app-routing.module.ts
	src/app/core/core.module.ts
	src/app/shared/log-in/log-in.component.html
	src/app/shared/log-in/log-in.component.spec.ts
	src/app/shared/log-in/log-in.component.ts
 2020-09-22 08:36:16 +02:00
Art Lowel
abab73b909 Merge branch 'Hard-redirect-after-log-in' into User-agreement 2020-09-11 16:54:17 +02:00
Art Lowel
7eb88f9fda Merge branch 'main' into Hard-redirect-after-log-in 2020-09-11 16:52:01 +02:00
Kristof De Langhe
eda1a34da5 72541: EndUserAgreementCurrentUserGuard and EndUserAgreementCookieGuard 2020-09-03 17:22:38 +02:00
Kristof De Langhe
beca98b441 Merge branch 'w2p-72699_Hard-redirect-after-log-in' into w2p-72541_User-agreement-and-Privacy-statement 
Conflicts:
	src/app/app-routing.module.ts
	src/app/core/core.module.ts
 2020-08-28 10:40:01 +02:00
Kristof De Langhe
7367f91176 72699: Hard redirect after log in 2020-08-26 14:20:47 +02:00
Kristof De Langhe
ecf75efe99 72541: Renamed end-user-agreement-guard and -service; Add metadata on registry; privacy statement component 2020-08-21 11:22:02 +02:00
Kristof De Langhe
d46355e274 72541: Accepting the End User Agreement + UserAgreementService 2020-08-20 17:28:25 +02:00
Kristof De Langhe
8768645e4a 72541: InfoModule, EndUserAgreementComponent, UserAgreementGuard 2020-08-19 17:47:33 +02:00
Kristof De Langhe
42978931de Merge branch 'main' into w2p-71764_Features-support-part-2 
Conflicts:
	src/app/core/core.module.ts
 2020-08-06 13:50:48 +02:00
ddinuzzo
793698a6d8 Merge branch 'main' into authorities_and_controlled_vocabularies 2020-08-03 11:00:38 +02:00
Yana De Pauw
76ad72f536 71806: Use server config for curation tasks 2020-07-30 14:31:59 +02:00
Giuseppe Digilio
c8c7e92717 Merge remote-tracking branch 'remotes/origin/main' into authorities_and_controlled_vocabularies 
# Conflicts:
#	src/app/core/core.module.ts
 2020-07-21 18:57:47 +02:00
Giuseppe Digilio
dda2668109 Merge remote-tracking branch 'remotes/origin/master' into authorities_and_controlled_vocabularies 2020-07-16 14:36:37 +02:00
Kristof De Langhe
522ad4b3dc Merge branch 'main' into w2p-71429_Features-support-part-1 
Conflicts:
	src/app/process-page/form/process-form.component.spec.ts
 2020-07-14 17:36:20 +02:00
Kristof De Langhe
7787a2d0e9 71764: SiteRegisterGuard + hide register link when unauthorized 2020-07-10 13:14:55 +02:00
Kristof De Langhe
bfeeb7c13e Merge branch 'master' into w2p-71429_Features-support-part-1 
Conflicts:
	src/app/+admin/admin-sidebar/admin-sidebar.component.ts
	src/app/app-routing.module.ts
	src/app/core/core.module.ts
 2020-07-06 16:16:17 +02:00
ddinuzzo
5650a4a235 Merge branch 'master' into language-header 2020-07-06 14:46:14 +02:00
Giuseppe Digilio
9015d50f59 Merge remote-tracking branch 'remotes/origin/master' into authorities_and_controlled_vocabularies 
# Conflicts:
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
 2020-07-03 09:29:59 +02:00
Tim Donohue
b731301b39 Merge pull request #749 from atmire/Edit-collection-item-template 
Edit collection item template
 2020-07-02 12:17:05 -05:00
Tim Donohue
0eb7eb6962 Merge pull request #703 from atmire/CC-License-Submission-Step 
Cc license submission step
 2020-07-02 11:22:33 -05:00
Tim Donohue
c2298f6fee Merge pull request #636 from atmire/scripts-processes 
Scripts & processes admin UI
 2020-07-02 09:46:50 -05:00
ddinuzzo
8c5347ab0f Merge branch 'master' into language-header 2020-07-02 14:51:17 +02:00
Kristof De Langhe
ba3c8d2b9e Merge branch 'master' into w2p-71429_Features-support-part-1 
Conflicts:
	src/app/core/core.module.ts
	src/app/core/eperson/eperson-data.service.ts
 2020-07-02 14:26:19 +02:00
Giuseppe Digilio
2ad62dd3e9 Merge remote-tracking branch 'remotes/origin/master' into authorities_and_controlled_vocabularies 
# Conflicts:
#	src/app/core/cache/response.models.ts
#	src/app/core/core.module.ts
#	src/app/core/data/request.models.ts
#	src/app/shared/shared.module.ts
 2020-07-02 14:07:18 +02:00
Samuel
531ef1fb1b Merge branch 'master' into CC-License-Submission-Step 2020-07-02 13:48:38 +02:00
Kristof De Langhe
b77fd69ac7 Merge branch 'master' into w2p-65272_Edit-collection-item-template 
Conflicts:
	src/app/core/auth/auth-request.service.ts
	src/app/core/core.module.ts
 2020-07-02 11:39:30 +02:00
Giuseppe Digilio
44381d7653 [CST-3088] fixed code 2020-07-01 22:57:26 +02:00
Tim Donohue
2fe9965411 Merge pull request #716 from atmire/Authorization-for-downloads-of-restricted-bitstreams 
Authorization for downloads of restricted bitstreams
 2020-07-01 15:43:20 -05:00
Art Lowel
df5d55c246 Merge branch 'Authorization-for-downloads-of-restricted-bitstreams' into scripts-processes 2020-07-01 18:51:23 +02:00
Giuseppe Digilio
7e80bcf9e9 Merge remote-tracking branch 'remotes/origin/master' into authorities_and_controlled_vocabularies 
# Conflicts:
#	src/app/core/cache/response.models.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
 2020-07-01 16:04:11 +02:00
Giuseppe Digilio
81f0391400 [CST-3088] Fix lint errors 2020-07-01 15:35:29 +02:00
Kristof De Langhe
5884308037 Merge branch 'master' into w2p-65272_Edit-collection-item-template 
Conflicts:
	src/app/+collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
	src/app/+item-page/edit-item-page/abstract-item-update/abstract-item-update.component.ts
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/item-metadata/item-metadata.component.ts
	src/app/core/core.module.ts
	src/app/core/data/data.service.ts
 2020-07-01 11:47:19 +02:00
Yana De Pauw
2863837bf8 Merge remote-tracking branch 'upstream/master' into w2p-70504_New-user-registration 2020-06-29 10:42:16 +02:00
ddinuzzo
746a72392f Merge branch 'master' into language-header 2020-06-29 09:36:54 +02:00
Samuel
fd59e02786 Merge branch 'master' into CC-License-Submission-Step 2020-06-26 16:59:48 +02:00
lotte
6ad7cee7d1 Merge branch 'master' into scripts-processes 2020-06-26 14:14:21 +02:00
Kristof De Langhe
9c27be085e Merge branch 'master' into w2p-71504_Authorization-for-downloads-of-restricted-bitstreams 
Conflicts:
	src/app/core/core.module.ts
 2020-06-26 10:03:07 +02:00
Giuseppe Digilio
63cca76b49 [CST-3088] Replace use of AuthorityService with new VocabularyService 2020-06-25 15:21:44 +02:00
Giuseppe Digilio
1156bd3934 [CST-3088] Added vocabulary service and models 2020-06-23 18:17:47 +02:00
Kristof De Langhe
bbaaaed4b5 71504: short-lived token for downloading files through FileService 2020-06-19 17:26:11 +02:00
Giuseppe Digilio
2653980beb Merge remote-tracking branch 'remotes/origin/master' into language-header 2020-06-19 11:19:31 +02:00
Kristof De Langhe
89afaaa4a5 71429: Abstract FeatureAuthorizationGuard + small fix 2020-06-18 17:39:11 +02:00
Kristof De Langhe
bbbeddc875 71429: SiteAdministratorGuard on admin routes + authorization check on visibility of admin sidebar sections 2020-06-18 17:13:37 +02:00
Samuel
e963aa9af0 CC License Submission Step - feedback 2020-06-18 15:20:55 +02:00
Kristof De Langhe
39e0c03593 71429: Feature and Authentication Models and Services 2020-06-17 16:27:25 +02:00
Samuel
470c21d8d8 Merge branch 'master' into CC-License-Submission-Step 2020-06-12 09:04:29 +02:00
Samuel
3db47f5791 CC License Submission Step 2 - Storing the results - add SubmissionCcLicenceUrl model 2020-06-12 09:04:00 +02:00
Kristof De Langhe
44386823a3 Merge branch 'master' into w2p-70834_Refactor-registry-service-and-associated-models 
Conflicts:
	src/app/core/data/data.service.ts
 2020-06-04 16:28:56 +02:00
Yana De Pauw
f136ea7d4f 70504: New user registration 2020-05-28 09:41:16 +02:00