hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-08 02:24:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,895 Commits 23 Branches 25 Tags
bbaaaed4b5f00dfba958b1257f2362a21b381e10
Commit Graph

199 Commits

Author SHA1 Message Date
Kristof De Langhe
bbaaaed4b5 71504: short-lived token for downloading files through FileService 2020-06-19 17:26:11 +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
lotte
92dca8d4e8 Merge branch 'master' into angular-cli 2020-04-17 16:09:12 +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
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
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
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
Giuseppe Digilio
e396fe054e Refactored Resource Policy service 2020-03-26 14:40:06 +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
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
lotte
8bf241c182 angular cli 2020-03-18 16:03:40 +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
18b9a41fe0 69305: Remove normalized action 2020-03-04 14:40:24 +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
254305652d Merge branch 'master' into w2p-68729_List-version-history 
Conflicts:
	src/app/core/cache/models/normalized-item.model.ts
	src/app/core/core.module.ts
	src/app/core/shared/item.model.ts
 2020-02-25 14:34:56 +01:00
Kristof De Langhe
d4ff4aab36 68729: Version and VersionHistory model, normalized and data-service classes 2020-02-18 16:05:38 +01:00
Art Lowel
bc7c92f44c removed remaining normalized models and related services 2020-02-17 18:35:10 +01:00
Art Lowel
07998a8c08 remove normalized models part 1 2020-02-17 18:22:42 +01:00
Art Lowel
56c3d12497 itermediate commit 2020-02-17 18:12:13 +01:00
Kristof De Langhe
c8be50614a Merge branch 'master' into w2p-68346_Bundles-in-edit-item-Updates 
Conflicts:
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/item-relationships/item-relationships.component.ts
	src/app/core/core.module.ts
	src/app/core/data/data.service.ts
	src/app/core/data/object-updates/object-updates.actions.ts
	src/app/core/data/object-updates/object-updates.reducer.spec.ts
	src/app/core/data/object-updates/object-updates.reducer.ts
	src/app/core/data/object-updates/object-updates.service.spec.ts
	src/app/core/data/object-updates/object-updates.service.ts
 2020-02-13 14:34:45 +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
Giuseppe Digilio
cc4b7b215e Prevent that RouteService is instantiated two times on both SSR and CSR 2020-02-07 13:08:19 +01:00
Art Lowel
ed11cb9f01 Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete 2020-01-27 11:26:15 +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
Tim Donohue
1472bd7df9 Merge pull request #506 from atmire/Collection-content-source-tab 
Collection content source tab
 2020-01-23 10:18:23 -06:00
Samuel
4f57d7ae83 Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete 2020-01-09 17:55:18 +01:00
Samuel
4e679ec6db PR-530 Keep virtual metadata on relationship delete - community feedback 2020-01-09 13:53:42 +01:00
Kristof De Langhe
d2c2431c6c Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2 
Conflicts:
	resources/i18n/en.json5
	src/app/core/core.module.ts
	src/app/core/data/collection-data.service.ts
	src/app/shared/shared.module.ts
 2020-01-06 11:48:44 +01:00
Kristof De Langhe
904228127e Merge remote-tracking branch 'atmire/clean-relationships-in-submission' into w2p-67478_Search-external-sources-in-submission 
Conflicts:
	src/app/+item-page/simple/related-items/related-items-component.ts
	src/app/+search-page/configuration-search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search-tracker.component.ts
	src/app/+search-page/search.component.ts
	src/app/app.reducer.ts
	src/app/core/data/data.service.ts
	src/app/core/data/relationship.service.ts
	src/app/core/services/route.service.ts
	src/app/core/utilities/equatable.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
	src/app/shared/form/builder/models/relationship-options.model.ts
 2019-12-19 11:55:28 +01:00
lotte
b98cec011b added documentation for endpoint mock service 2019-12-19 11:15:44 +01:00
lotte
c54faf69b1 Merge branch 'master' into clean-relationships-in-submission 2019-12-16 10:45:21 +01:00
Kristof De Langhe
b51218ad5f Merge branch 'master' into w2p-67478_Search-external-sources-in-submission 
Conflicts:
	src/app/+collection-page/collection-page.module.ts
	src/app/+item-page/simple/related-entities/related-entities-search/related-entities-search.component.html
	src/app/+item-page/simple/related-items/related-items-component.ts
	src/app/+search-page/configuration-search-page.component.spec.ts
	src/app/+search-page/configuration-search-page.component.ts
	src/app/+search-page/filtered-search-page.component.spec.ts
	src/app/+search-page/filtered-search-page.component.ts
	src/app/+search-page/search-page.component.html
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-page.module.ts
	src/app/+search-page/search.component.spec.ts
	src/app/app.reducer.ts
	src/app/core/data/data.service.spec.ts
	src/app/core/data/data.service.ts
	src/app/core/data/relationship.service.ts
	src/app/core/shared/search/search-configuration.service.ts
	src/app/core/shared/search/search.service.ts
 2019-12-06 11:56:28 +01:00
Kristof De Langhe
edbc32604d 67478: LookupRelationService, external source tabs, list implementation 2019-12-02 17:07:28 +01:00
Kristof De Langhe
de4b32dcad 67478: Intermediate commit - Basic components 2019-11-29 17:51:27 +01:00
lotte
d1ba3d9936 Merge branch 'master' into clean-relationships-in-submission 2019-11-29 08:52:10 +01:00
Antoine Snyers
dfa846a98e Track page views and searches in DSpace with a custom Angulartics2 provider 2019-11-28 09:54:39 +01:00
Kristof De Langhe
dc9520a832 Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2 
Conflicts:
	resources/i18n/en.json5
	src/app/core/core.module.ts
	src/app/core/data/collection-data.service.spec.ts
	src/app/core/data/collection-data.service.ts
	src/app/core/data/request.models.ts
	src/app/shared/shared.module.ts
 2019-10-29 17:36:42 +01:00
Kristof De Langhe
8059301906 65717: Move operations from custom order + sending bundle patch 2019-10-28 14:27:12 +01:00
Kristof De Langhe
5fa2827d1b Merge branch 'master' into w2p-65717_Bundles-in-edit-item 
Conflicts:
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/core/core.module.ts
	src/app/core/data/item-data.service.ts
	src/app/shared/shared.module.ts
 2019-10-18 12:42:11 +02:00
lotte
f79e210959 Merge branch 'w2p-65195_dynamic-component-refactoring' into clean-relationships-in-submission 2019-10-17 12:49:22 +02:00
Kristof De Langhe
a1ac80e53a Merge branch 'master' into w2p-64961_Edit-bitstream-page 
Conflicts:
	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/app-routing.module.ts
	src/app/shared/shared.module.ts
 2019-09-12 13:21:08 +02:00
Kristof De Langhe
8b5a3ac9b3 Merge branch 'master' of https://git.atmire.com/contributions/dspace-angular into w2p-62589_Item-mapper-update 2019-09-11 10:09:35 +02:00
lotte
2b24caba34 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-09-06 15:22:44 +02:00
Kristof De Langhe
7fe0db7d7c Merge branch 'master' into w2p-62589_Item-mapper-update 
Conflicts:
	src/app/+item-page/edit-item-page/edit-item-page.module.ts
	src/app/+item-page/edit-item-page/edit-item-page.routing.module.ts
	src/app/+search-page/search-service/search.service.ts
 2019-09-06 12:52:36 +02:00
benbosman
c4c6de66de Merge pull request #402 from atmire/Item-Relations-Edit-Delete 
Item relations edit delete
 2019-09-05 15:59:41 +02:00
Kristof De Langhe
04f57b753e Merge branch 'master' into w2p-62589_Item-mapper-update 
Conflicts:
	src/app/app.reducer.ts
	src/app/shared/shared.module.ts
 2019-09-05 14:16:13 +02:00
lotte
b634799ef9 Merge branch 'master' into w2p-62355_optimize-search-performance 2019-09-05 10:16:51 +02:00