hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,478 Commits 24 Branches 25 Tags
e68e605211fa01678eaa4ce1f019ebba5d1777c1
Commit Graph

382 Commits

Author SHA1 Message Date
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
lotte
8bf241c182 angular cli 2020-03-18 16:03:40 +01:00
Kristof De Langhe
30c7e563f5 68729: Edit version history page as tab, removed sidebar link, added under-construction notice 2020-03-17 16:01:00 +01:00
Kristof De Langhe
0f55ee8adb 68346: Replace Bundle dropdown with combobox + edit-bistream cache fix 2020-03-13 17:52:46 +01:00
lotte
0175b50d48 applied feedback 2020-03-12 12:49:48 +01:00
lotte
401393c8bd grid view for admin search results 2020-03-10 10:49:18 +01:00
lotte
6c7780ca56 fixed translation service issues 2020-03-09 11:15:48 +01:00
lotte
f5a66c2266 added missing translation helper for facets 2020-03-06 16:22:04 +01:00
lotte
d5484e5c89 created admin search page 2020-03-06 13:54:46 +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
Kristof De Langhe
305c4ce882 68954: Display claimed task actions depending on config from REST API 
Conflicts:
	src/app/core/core.module.ts
	src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
 2020-03-04 14:38:20 +01:00
Giuseppe Digilio
076ee8b26d Merge remote-tracking branch 'remotes/origin/master' into shibboleth 
# Conflicts:
#	src/app/core/auth/auth.service.ts
#	src/app/core/auth/models/auth-status.model.ts
#	src/app/core/auth/models/normalized-auth-status.model.ts
#	src/app/core/auth/server-auth.service.ts
#	src/app/core/core.module.ts
#	src/app/shared/shared.module.ts
 2020-02-25 17:31:07 +01:00
Kristof De Langhe
0cb606877b Merge branch 'master' into w2p-68729_List-version-history 
Conflicts:
	src/app/shared/shared.module.ts
 2020-02-21 14:30:50 +01:00
Kristof De Langhe
29ff18264c 68729: Edit Item Version History page + sidebar menu option - moving item-versions component to shared module 2020-02-19 17:58:23 +01:00
lotte
04cb75e786 upgraded to angular 8 2020-02-13 11:09:20 +01:00
Giuseppe Digilio
c1db19ee03 Merge remote-tracking branch 'remotes/origin/master' into shibboleth 
# Conflicts:
#	src/app/shared/shared.module.ts
 2020-02-07 15:04:12 +01:00
Kristof De Langhe
5e93a89678 68346: PaginatedDragAndDropBitstreamList component and refactoring item-edit-bitstream-bundle using this new component ; removed pagination-drag-and-drop 2020-02-06 16:57:17 +01:00
Kristof De Langhe
2795c1ecc7 68346: initial Drag-And-Drop pagination component + paginated custom-order support in field-updates store - Intermediate commit 2020-02-05 18:04:10 +01:00
Kristof De Langhe
b2ef5ee2fa Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates 
Conflicts:
	package.json
	resources/i18n/en.json5
	src/app/+item-page/item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/bundle-data.service.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/item-data.service.ts
	src/app/core/data/object-updates/object-updates.service.ts
	src/app/core/shared/hal-endpoint.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/mocks/mock-request.service.ts
	src/app/shared/shared.module.ts
	src/app/shared/trackable/abstract-trackable.component.ts
	yarn.lock
 2020-01-24 14:21:20 +01:00
Giuseppe Digilio
eb866d85ef Fixed merge 2020-01-17 12:12:03 +01:00
Giuseppe Digilio
29b2e89625 Merge remote-tracking branch 'remotes/origin/master' into shibboleth 
# Conflicts:
#	src/app/core/auth/auth.interceptor.ts
#	src/app/shared/auth-nav-menu/auth-nav-menu.component.html
#	src/app/shared/shared.module.ts
 2020-01-17 12:11:46 +01:00
Kristof De Langhe
7b3a2e9dc8 Merge branch 'master' into w2p-67611_Convert-external-source-to-entity 
Conflicts:
	src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.ts
	src/app/shared/shared.module.ts
 2020-01-16 17:54:12 +01:00