hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-11 03:53:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,981 Commits 23 Branches 25 Tags
c2f44c33f34550d35404a718d4923388e9c15c3c
Commit Graph

553 Commits

Author SHA1 Message Date
Matteo
4370f197ec Merge branch 'master' into DS-4515_submit-external-source 2020-07-02 09:47:58 +02: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
e0604026c5 [CST-3088] Added component to show hierarchical vocabulary as a tree 2020-07-01 15:16:14 +02:00
Kristof De Langhe
9f91fd2ad7 Merge branch 'master' into w2p-71504_Authorization-for-downloads-of-restricted-bitstreams 
Conflicts:
	src/app/shared/shared.module.ts
 2020-07-01 11:05:05 +02:00
lotte
c7994f9d90 Merge branch 'master' into scripts-processes 2020-06-30 13:25:59 +02:00
Art Lowel
3e6195a124 Merge branch 'master' into metadata-and-relationships-combined-in-submission 2020-06-30 11:49:08 +02:00
Samuel
6ef60351a5 Merge branch 'master' into CC-License-Submission-Step 2020-06-30 10:29:43 +02:00
lotte
6ad7cee7d1 Merge branch 'master' into scripts-processes 2020-06-26 14:14:21 +02:00
Matteo Perelli
43f5e08530 External source import completed with tests 2020-06-24 10:16:30 +02:00
Art Lowel
05b2489da5 Merge branch 'master' into metadata-and-relationships-combined-in-submission 2020-06-22 11:50:44 +02:00
Kristof De Langhe
b578aa408b 71504: FileDownloadLinkComponent 2020-06-22 11:40:39 +02:00
Danilo Di Nuzzo
9e05072290 [CST-3090] done 2020-06-16 14:26:59 +02:00
Samuel
470c21d8d8 Merge branch 'master' into CC-License-Submission-Step 2020-06-12 09:04:29 +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
Samuel
245cb45503 CC License Submission Step 2020-05-19 16:02:05 +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
aa9570c776 Merge branch 'master' into metadata-and-relationships-combined-in-submission 2020-05-12 17:19:08 +02:00
Kristof De Langhe
f548d5bf20 Merge branch 'master' into Login-as-EPerson 
Conflicts:
	src/app/+admin/admin-access-control/epeople-registry/eperson-form/eperson-form.component.spec.ts
	src/app/core/auth/auth.service.spec.ts
	src/app/profile-page/profile-page.component.spec.ts
 2020-05-12 16:54:40 +02:00
lotte
e8f418b077 Merge branch 'master' into w2p-70136_workflow-search-ui 2020-05-11 11:58:31 +02:00
lotte
a561f37b00 fixed missing comma 2020-05-11 11:29:29 +02:00
lotte
4f7afc578f Merge branch 'master' into scripts-processes 2020-05-11 11:28:52 +02:00
Giuseppe Digilio
b338332d13 Added possibility to search for eperson or group while adding a new resource policy 2020-04-30 15:43:52 +02:00
Art Lowel
afe394e2a4 Merge branch 'master' into w2p-70237_entities-orgunit-submission-fix 2020-04-28 17:45:29 +02:00
lotte
92dca8d4e8 Merge branch 'master' into angular-cli 2020-04-17 16:09:12 +02:00
Giuseppe Digilio
4deaf145b6 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.ts
#	src/app/shared/testing/group-mock.ts
 2020-04-15 16:18:27 +02:00
Kristof De Langhe
c48bb2cbb0 70373: Stop impersonating button in navbar + clear cookie on logout 2020-04-15 13:08:04 +02:00
Giuseppe Digilio
46498992a7 Renamed ResourcePolicyFormComponent's file 2020-04-14 20:58:58 +02:00
lotte
76790be925 Merge branch 'master' into w2p-70136_workflow-search-ui 2020-04-09 11:42:09 +02:00
Samuel
6a828f9286 Edit Community - Assign Roles/Groups (Angular) 2020-04-08 10:39:27 +02:00
lotte
74db9030b0 working on fixes for OrgUnit field in submission 2020-04-07 18:17:37 +02:00
Giuseppe Digilio
9339ae2d7c Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies 
# Conflicts:
#	resources/i18n/en.json5
#	src/app/+item-page/edit-item-page/edit-item-page.module.ts
#	src/app/shared/shared.module.ts
 2020-04-04 15:59:44 +02:00
Giuseppe Digilio
6314e17f27 Intermediate commit 2020-04-03 20:25:58 +02:00
lotte
2eb3d11cd2 debugging issue commit 2020-04-03 16:00:52 +02:00
Kristof De Langhe
5e651881b5 Merge branch 'master' into w2p-69305_Apply-new-MyDSpace-fix 
Conflicts:
	src/app/shared/shared.module.ts
 2020-04-03 10:57:27 +02:00
Giuseppe Digilio
5a37891184 Merge remote-tracking branch 'remotes/origin/master' into #601-resource-policies 
# Conflicts:
#	src/app/shared/shared.module.ts
 2020-04-02 19:12:19 +02:00
Giuseppe Digilio
fab11e9055 Added component to edit and create a resource policy 2020-04-02 18:58:51 +02:00
lotte
6b6068ffb8 Merge branch 'master' into angular-cli 2020-03-31 13:49:40 +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
e38aec831f fixed file upload, styling, boolean/date/output inputs 2020-03-30 15:19:22 +02:00
Giuseppe Digilio
18d38ca737 Implemented resource policies component 2020-03-30 12:36:36 +02:00
Tim Donohue
b535d166e0 Merge pull request #568 from 4Science/shibboleth 
Dspace 7 shibboleth (Angular)
 2020-03-27 09:56:31 -05:00
Kristof De Langhe
7996555ec2 Merge branch 'master' into w2p-69305_Apply-new-MyDSpace-fix 
Conflicts:
	src/app/core/core.module.ts
	src/app/shared/shared.module.ts
 2020-03-27 09:59:33 +01:00
Kristof De Langhe
74af325e45 Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates 
Conflicts:
	src/app/shared/shared.module.ts
 2020-03-25 14:01:44 +01: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
441d8a07b5 68948: New version notice 2020-03-20 17:47:19 +01:00
Kristof De Langhe
32546273e2 Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates 
Conflicts:
	src/app/core/core.module.ts
	src/app/shared/shared.module.ts
 2020-03-20 17:22:58 +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
Kristof De Langhe
e8049aac04 Merge branch 'master' into w2p-68729_List-version-history 
Conflicts:
	src/app/shared/shared.module.ts
 2020-03-19 14:19:57 +01:00