hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,267 Commits 24 Branches 25 Tags
ccb3c98f813d34b7b8c718ed9e2d0dae4c5035d9
Commit Graph

400 Commits

Author SHA1 Message Date
Tim Donohue
b2f0e9f620 Merge pull request #591 from atmire/w2p-68921_breadcrumbs 
Breadcrumbs
 2020-02-28 10:36:43 -06:00
lotte
3d1e93f5ef feedback 2020-02-27 16:53:47 +01:00
muiltje
5acbf4f216 Second batch of Dutch translations 2020-02-27 08:54:59 +01:00
muiltje
423cf7569a First batch of Dutch translations 2020-02-27 08:54:59 +01:00
muiltje
9d988022c7 First batch of Dutch translations 2020-02-27 08:54:59 +01:00
muiltje
802498e27e First batch of Dutch translations 2020-02-27 08:54:59 +01:00
lotte
4ae8997ada added tests for breadcrumbs service and component 2020-02-26 14:44:34 +01:00
Samuel
ddbc0e097a Merge branch 'master' into Virtual-metadata-on-item-delete 2020-02-05 17:05:23 +01:00
Tim Donohue
6f4f0eab11 Merge pull request #552 from atmire/submission-upload.required 
verify whether file uploads are mandatory
 2020-02-05 09:12:14 -06:00
Ben Bosman
a45273048d verify whether file uploads are mandatory => observe changes to both filelist and required status 2020-01-31 09:47:40 +01:00
Samuel
58bfb9b1a7 Merge branch 'master' into Virtual-metadata-on-item-delete 2020-01-29 12:28:18 +01:00
Tim Donohue
3a9277c415 Merge pull request #569 from paulo-graca/patch-2 
adding relationships.isContributorOf i18n support
 2020-01-28 11:00:21 -06:00
Samuel
cff3a6f010 Merge branch 'Keep-virtual-metadata-on-relationship-delete' into Virtual-metadata-on-item-delete 2020-01-28 14:22:43 +01:00
Art Lowel
ed11cb9f01 Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete 2020-01-27 11:26:15 +01:00
Paulo Graça
34f79f1667 adding relationships.isContributorOf support 2020-01-24 16:12:31 +00: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
Kristof De Langhe
d8bdd768ca Merge branch 'w2p-67478_Search-external-sources-in-submission' into w2p-67611_Convert-external-source-to-entity 2020-01-14 13:07:24 +01:00
Kristof De Langhe
4ba3b01997 Merge branch 'master' into w2p-67478_Search-external-sources-in-submission 
Conflicts:
	src/app/core/data/data.service.ts
	src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
 2020-01-14 12:46:55 +01:00
Samuel
de0992bf85 PR-533 Virtual metadata on item delete 2020-01-10 17:00:32 +01:00
Samuel
4f57d7ae83 Merge branch 'master' into Keep-virtual-metadata-on-relationship-delete 2020-01-09 17:55:18 +01:00
Kristof De Langhe
894888fc8f Merge branch 'master' into w2p-64503_Edit-collection-Content-Source-2 
Conflicts:
	resources/i18n/en.json5
	src/app/+collection-page/edit-collection-page/edit-collection-page.component.ts
	src/app/+community-page/edit-community-page/edit-community-page.component.ts
	src/app/shared/shared.module.ts
 2020-01-09 10:34:08 +01:00
Kristof De Langhe
42d12a83ce Merge branch 'master' into w2p-65240_Community-and-collection-logos 
Conflicts:
	src/app/shared/shared.module.ts
 2020-01-07 16:11:24 +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
e2c4e6d27b Merge branch 'w2p-67478_Search-external-sources-in-submission' into w2p-67611_Convert-external-source-to-entity 
Conflicts:
	src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
	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/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
 2019-12-19 17:00: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
38f3f583f6 Merge branch 'master' into clean-relationships-in-submission 2019-12-18 14:48:48 +01:00
Paulo Graça
9ad78e1ff1 Merge branch 'master' of github.com:DSpace/dspace-angular into rcaap-openaire4-translations 2019-12-17 17:22:01 +00:00
lotte
c54faf69b1 Merge branch 'master' into clean-relationships-in-submission 2019-12-16 10:45:21 +01:00
Philip Vissenaekens
9a921e9311 Merge remote-tracking branch 'dspace/master' into w2p-65240_Community-and-collection-logos-2 
# Conflicts:
#	src/app/+collection-page/collection-page.component.html
#	src/app/core/data/comcol-data.service.ts
 2019-12-12 13:08:38 +01:00
Paulo Graça
23352412ce Merge branch 'master' of github.com:DSpace/dspace-angular into configurable_entities 2019-12-10 18:05:54 +00:00
Paulo Graça
46c9a77cd9 adding default translations for funding lookup interface 2019-12-10 18:05:48 +00:00
Kristof De Langhe
64944ebb71 Merge branch 'master' into w2p-66155_Item-page-entities-improvement 
Conflicts:
	src/app/+item-page/simple/related-items/related-items-component.ts
 2019-12-09 12:46:07 +01:00
Kristof De Langhe
1402dd9129 67611: Import new external entity and add to selection + message changes/refactoring 2019-12-06 16:52:30 +01:00
Kristof De Langhe
3a7fa8dbaf Merge branch 'w2p-67478_Search-external-sources-in-submission' into w2p-67611_Convert-external-source-to-entity 
Conflicts:
	src/app/core/data/item-data.service.ts
 2019-12-06 13:23:47 +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
Tim Donohue
a78e0512cb Merge pull request #517 from atmire/Tabbed-display-of-relations 
Tabbed display of relations
 2019-12-05 14:28:33 -06:00
Kristof De Langhe
f0e38e9e8c 67611: Console error fix, notification on adding local entity and JSDocs 2019-12-05 17:31:13 +01:00
Kristof De Langhe
e13801ce81 Merge branch 'master' into w2p-66156_Display-of-relations 
Conflicts:
	src/app/+item-page/item-page.module.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.module.ts
 2019-12-05 16:23:33 +01:00
Kristof De Langhe
fda083137a 67611: Import external entry as new entity pt1 2019-12-05 15:48:54 +01:00
Kristof De Langhe
0210be1a53 67611: External-Source-Entry import window 2019-12-04 17:54:01 +01:00
Marie Verdonck
0b368e8c25 Merge remote-tracking branch 'upstream/master' into w2p-66391_ComCol-Tree---PR-Feedback 2019-12-04 14:09:04 +01:00
Tim Donohue
a0347d263f Merge pull request #528 from atmire/add-fonts 
Add support for locally hosted fonts
 2019-12-03 15:55:59 -06:00
Samuel
891415daae taskid 66076 Keep virtual metadata on item delete - tests & docs & small fixes 2019-12-03 16:54:55 +01:00
Samuel
2eac2a20bb Merge branch 'master' into w2p-66074_Keep-virtual-metadata-on-relationship-delete 2019-12-03 16:54:48 +01:00
Kristof De Langhe
edbc32604d 67478: LookupRelationService, external source tabs, list implementation 2019-12-02 17:07:28 +01:00
lotte
d1ba3d9936 Merge branch 'master' into clean-relationships-in-submission 2019-11-29 08:52:10 +01:00
Kristof De Langhe
424089312b Merge branch 'master' into w2p-65240_Community-and-collection-logos 2019-11-28 11:39:26 +01:00
Kristof De Langhe
6b3a395e4a Merge branch 'master' into w2p-66155_Item-page-entities-improvement 
Conflicts:
	resources/i18n/en.json5
	src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.html
	src/app/+item-page/simple/related-items/related-items.component.html
 2019-11-28 11:02:37 +01:00
Kristof De Langhe
9b711cc460 Merge branch 'master' into w2p-66156_Display-of-relations 
Conflicts:
	src/app/+search-page/filtered-search-page.component.ts
	src/app/+search-page/search-page.module.ts
 2019-11-27 18:03:03 +01:00
Kristof De Langhe
1b978124d1 66156: Removal of redundant fields, message update and aciveTab as observable 2019-11-27 18:01:31 +01:00