hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 10:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,523 Commits 23 Branches 25 Tags
1ef3d40904cc7cd8c3e545693b00b066b4e30aab
Commit Graph

93 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
Kristof De Langhe
c5e975601a Merge branch 'w2p-72699_Hard-redirect-after-log-in' into w2p-72541_User-agreement-and-Privacy-statement 
Conflicts:
	src/app/app-routing.module.ts
 2020-09-08 10:17:44 +02:00
Kristof De Langhe
b89c21ec3b Merge branch 'main' into w2p-72699_Hard-redirect-after-log-in 
Conflicts:
	src/app/app-routing.module.ts
 2020-09-07 10:22:37 +02:00
Tim Donohue
dd037459cf Merge pull request #715 from 4Science/DS-4515_submit-external-source 
DS-4515: Start new submission via Search or ID Lookup (i.e. submit external source)
 2020-09-04 09:49:55 -05:00
Kristof De Langhe
eda1a34da5 72541: EndUserAgreementCurrentUserGuard and EndUserAgreementCookieGuard 2020-09-03 17:22:38 +02:00
Kristof De Langhe
a0759098ea Merge branch 'w2p-72699_Hard-redirect-after-log-in' into w2p-72541_User-agreement-and-Privacy-statement 
Conflicts:
	src/app/+collection-page/collection-page-routing.module.ts
	src/app/+community-page/community-page-routing.module.ts
	src/app/+item-page/item-page-routing.module.ts
	src/app/+workflowitems-edit-page/workflowitems-edit-page-routing.module.ts
	src/app/app-routing.module.ts
	src/app/core/shared/operators.ts
 2020-09-03 16:06:59 +02:00
Kristof De Langhe
3d08eb0ae1 Merge branch 'main' into w2p-72699_Hard-redirect-after-log-in 
Conflicts:
	src/app/app-routing.module.ts
	src/app/shared/log-in/log-in.component.ts
 2020-09-03 13:19:36 +02:00
Kristof De Langhe
306d6d15c5 Merge branch 'w2p-72699_Hard-redirect-after-log-in' into w2p-72541_User-agreement-and-Privacy-statement 
Conflicts:
	src/app/app-routing.module.ts
 2020-09-03 10:49:06 +02:00
Art Lowel
724e5d1f12 add blocking state to make dealing with log in errors more user friendly 2020-09-01 10:10:39 +02:00
Art Lowel
21e8879f77 remove circular dependencies 2020-08-28 11:34:17 +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
8768645e4a 72541: InfoModule, EndUserAgreementComponent, UserAgreementGuard 2020-08-19 17:47:33 +02:00
Giuseppe Digilio
2529c91868 Merge remote-tracking branch 'remotes/DSpacegithub/main' into DS-4515_submit-external-source 2020-07-27 09:49:33 +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
Matteo
633dfaaa6d Merge branch 'master' into DS-4515_submit-external-source 2020-07-06 09:16:07 +02:00
Tim Donohue
c2298f6fee Merge pull request #636 from atmire/scripts-processes 
Scripts & processes admin UI
 2020-07-02 09:46:50 -05: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
Matteo
4370f197ec Merge branch 'master' into DS-4515_submit-external-source 2020-07-02 09:47:58 +02:00
lotte
6ad7cee7d1 Merge branch 'master' into scripts-processes 2020-06-26 14:14:21 +02:00
Kristof De Langhe
080ddf8a1f 71429: Unauthorized page fixes 2020-06-24 15:05:24 +02:00
Kristof De Langhe
78a5bd5fce 71429: Unauthorized component 2020-06-24 14:22:28 +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
Matteo Perelli
fb40b8f031 Submission from an external source initial commit 2020-06-18 16:16:31 +02:00
Yana De Pauw
6f9f4ec968 71304: Implement Forgot password components 2020-06-15 11:59:25 +02:00
Yana De Pauw
035a4b6e16 Merge remote-tracking branch 'upstream/master' into Forgot-Password 2020-06-10 17:05:37 +02:00
Yana De Pauw
bca1e8bdd4 70504: Implement feedback 2020-05-28 09:43:47 +02:00
Yana De Pauw
f136ea7d4f 70504: New user registration 2020-05-28 09:41:16 +02:00
Giuseppe Digilio
c5bf8f6267 Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies 
# Conflicts:
#	src/app/shared/shared.module.ts
 2020-05-21 19:35:35 +02:00
Giuseppe Digilio
b5d92590ee Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies 
# Conflicts:
#	src/app/core/eperson/eperson-data.service.spec.ts
#	src/app/core/eperson/group-data.service.spec.ts
#	src/app/shared/shared.module.ts
#	src/app/submission/sections/upload/section-upload.component.spec.ts
 2020-05-20 15:37:33 +02:00
Kristof De Langhe
ad26ececbf Merge branch 'master' into Login-as-EPerson 
Conflicts:
	src/app/shared/shared.module.ts
 2020-05-19 10:01:10 +02:00
lotte
4f7afc578f Merge branch 'master' into scripts-processes 2020-05-11 11:28:52 +02:00
Art Lowel
c2789dfbf7 fix issue where a hard refresh wouldn't work to clear the state due to the browser caching the html 2020-04-24 13:16:52 +02:00
Giuseppe Digilio
c03146e415 Fixed resource policy's group edit link 2020-04-16 17:12:20 +02:00
lotte
76790be925 Merge branch 'master' into w2p-70136_workflow-search-ui 2020-04-09 11:42:09 +02:00
lotte
2eb3d11cd2 debugging issue commit 2020-04-03 16:00:52 +02:00
lotte
6e49ef6859 start of admin workflow ui 2020-04-01 17:04:54 +02:00
Kristof De Langhe
b1b8c05150 Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates 
Conflicts:
	src/app/app-routing.module.ts
	src/app/shared/shared.module.ts
 2020-03-30 16:42:06 +02:00
lotte
1cb39cef41 created new process page 2020-03-30 15:17:01 +02:00
Giuseppe Digilio
7cf0480098 Merge remote-tracking branch 'remotes/origin/master' into shibboleth 
# Conflicts:
#	src/app/app-routing.module.ts
#	src/app/core/auth/auth.service.ts
#	src/app/shared/shared.module.ts
 2020-03-23 10:36:19 +01:00
Kristof De Langhe
08a6fa7c96 Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates 
Conflicts:
	src/app/core/cache/server-sync-buffer.effects.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/shared/shared.module.ts
 2020-03-19 17:12:04 +01:00
Tim Donohue
7c4a84bc2b Merge pull request #618 from atmire/Manage-account-profile 
Manage account profile
 2020-03-18 09:56:06 -05:00
lotte
92c5804af5 force resolvers to rerun on sub-path change 2020-03-17 09:01:03 +01:00
Kristof De Langhe
004297fcfa 69432: Profile metadata form validation + notifications 2020-03-11 11:54:32 +01:00
Kristof De Langhe
51e732e430 69432: Profile page intermediate commit 2020-03-10 17:06:59 +01:00
lotte
401393c8bd grid view for admin search results 2020-03-10 10:49:18 +01:00
Kristof De Langhe
a054938d80 Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates 
Conflicts:
	package.json
	src/app/+item-page/item-page-routing.module.ts
	src/app/core/cache/builders/remote-data-build.service.ts
	src/app/core/cache/server-sync-buffer.effects.ts
	src/app/core/core.module.ts
	src/app/core/data/bitstream-data.service.ts
	src/app/core/data/bundle-data.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/dso-change-analyzer.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/object-updates/object-updates.actions.ts
	src/app/core/shared/bitstream.model.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/shared/mocks/mock-request.service.ts
	src/app/shared/shared.module.ts
	yarn.lock
 2020-03-05 17:21:38 +01:00