hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 22:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,312 Commits 32 Branches 125 Tags
96f08e4414e5642a0f24b9ec3bf3585c09cb6126
Commit Graph

96 Commits

Author SHA1 Message Date
Ben Bosman
96f08e4414 Merge branch 'w2p-59343_support-ordered-metadata' into w2p-58898_place-column-calculation-error 
# Conflicts:
#	dspace-spring-rest/src/main/java/org/dspace/app/rest/repository/DSpaceRestRepository.java
 2019-01-29 10:41:05 +01:00
Ben Bosman
7abc5b01e2 Merge remote-tracking branch 'origin/w2p-57159_permission-to-create-relations' into w2p-58898_place-column-calculation-error 
# Conflicts:
#	dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
#	dspace-api/src/main/java/org/dspace/content/service/RelationshipService.java
 2019-01-29 09:58:22 +01:00
Raf Ponsaerts
7dc59a03a2 Fixed nullpointer issue in th comparator 2019-01-28 15:35:56 +01:00
Raf Ponsaerts
b908df263c [Task 59343] sorted the list of metadatavalues and forced the itemconverter to use the itemservice 2019-01-28 13:24:35 +01:00
Raf Ponsaerts
7d961db6ce Applied feedback 2019-01-28 11:49:19 +01:00
Ben Bosman
d7610ccf6e Resolving merge conflict 2019-01-24 14:19:09 +01:00
Ben Bosman
1311c40cb7 Merge remote-tracking branch 'origin/w2p-57159_permission-to-create-relations' into w2p-58898_place-column-calculation-error 
# Conflicts:
#	dspace-api/src/main/java/org/dspace/content/ItemServiceImpl.java
#	dspace-api/src/main/java/org/dspace/content/RelationshipServiceImpl.java
#	dspace-api/src/main/java/org/dspace/content/service/ItemService.java
#	dspace-api/src/main/java/org/dspace/content/virtual/Collected.java
#	dspace-api/src/main/java/org/dspace/content/virtual/UUIDValue.java
#	dspace-spring-rest/src/test/java/org/dspace/app/rest/RelationshipRestRepositoryIT.java
#	dspace/config/spring/api/core-services.xml
 2019-01-24 13:59:36 +01:00
Ben Bosman
51de4cd87c JavaDocs and boolean name update 2019-01-24 13:26:35 +01:00
Raf Ponsaerts
1ed01310b0 Implemented the additional getMetadata function with the boolean 2019-01-24 10:06:42 +01:00
Raf Ponsaerts
7e14562139 Merged configurable_entities into w2p-57159_permission-to-create-relations 2019-01-22 12:50:44 +01:00
Raf Ponsaerts
bfc1b39ea2 Merged configurable_entities into w2p-58898_place-column-calculation-error 2019-01-21 09:19:01 +01:00
Raf Ponsaerts
7f225f1ad5 Fixed the place attribute not being set to the virtual metadata 2019-01-14 15:29:54 +01:00
benbosman
0692701f7a Merge pull request #2270 from atmire/virtual-metadata-update 
Entities Virtual metadata update
 2018-12-21 12:49:05 +01:00
Ben Bosman
fe437ad88d checkstyle 2018-12-18 10:29:47 +01:00
Ben Bosman
dc6bd487e0 checkstyle 2018-12-18 10:29:04 +01:00
Ben Bosman
b050db1cae JavaDoc updates 2018-12-18 10:17:12 +01:00
Ben Bosman
efd579f054 typing error 2018-12-18 09:58:57 +01:00
Ben Bosman
1b0f00df18 Comment on relationship.type 2018-12-18 09:42:48 +01:00
Raf Ponsaerts
4e51fd0c86 Added support for the leftItem and rightItem through the parameters 2018-12-14 17:20:45 +01:00
Raf Ponsaerts
d95c378edc Implemented the feedback 2018-12-13 15:45:15 +01:00
Raf Ponsaerts
314e96a6ac Merged the merging-csv-functionality branch into virtual-metadata-update 2018-12-12 10:54:16 +01:00
Raf Ponsaerts
6e16a3ed62 Applied community feedback 2018-12-07 16:09:29 +01:00
Raf Ponsaerts
7d07a1e6f9 Merged branch configurable_entities into w2p-57712_merging-csv-functionality 2018-12-07 10:38:19 +01:00
Tim Donohue
ceed829800 Merge branch 'master' into configurable_entities 2018-12-06 17:05:31 +00:00
Raf Ponsaerts
e7b6aded69 Fixed tests and added license headers 2018-11-22 10:41:45 +01:00
Raf Ponsaerts
912a1f0be6 Merged entities-PR2 into virtual-metadata-update 2018-11-21 15:47:08 +01:00
Raf Ponsaerts
b905f69d63 Refactored the usages of MetadataSchema.DC to use the enum instead 2018-11-21 09:35:11 +01:00
Raf Ponsaerts
cfeabe349c [Task 57188] added the logic for the advanced place column calculation. Enforced that all virtual metadata are valid metadatafields 2018-11-20 14:32:12 +01:00
Raf Ponsaerts
0ba6d75a30 Constructed a RelationshipMetadataValue object and refactored the getRelationshipMetadata methods in the ItemServiceImpl to use this object instead of it's parent MetadataValue 2018-11-19 16:14:51 +01:00
Raf Ponsaerts
255de21271 [Task 57187] added the relationship ID after the virtual:: in the metadata field authority 2018-11-16 10:10:02 +01:00
Raf Ponsaerts
8e8bb65f75 Removed a problematic context.close() 2018-11-15 15:13:16 +01:00
Raf Ponsaerts
353d4c9d60 [Task 57103] implemented the support for related beans and added the option for config to supply virtual metadata throughout many nested relations 2018-11-14 16:06:33 +01:00
Raf Ponsaerts
37ffda5d21 Made sure that the delete and create functions in relationshipservice update the place attributes accordingly. Fixed checkstyle and added license header. Changed cacheable functions to false in relationshipDAO 2018-11-12 15:56:28 +01:00
Raf Ponsaerts
5de574d65a Merged w2p-57104_csv-import-delete-functionality into w2p-57107_mixing-entities-and-plaintest-values 2018-11-12 13:14:40 +01:00
Raf Ponsaerts
b3a4a196d8 [Task 57107] changed the functionality of the VirtualMetadataPopulator to now support a bean 2018-11-12 12:43:10 +01:00
Patrick Trottier
7f4b4e9f8a Convert getLogger() and Log4J imports for Log4J 2 2018-11-09 08:41:42 -05:00
Tim Donohue
200cede397 Upgrade to commons-lang3 to avoid dependency conv issues. 2018-11-08 20:35:57 +00:00
Raf Ponsaerts
bfd0bd7362 [Task 57104] adding delete functionality for the csv import 2018-11-06 15:30:13 +01:00
Raf Ponsaerts
d8ced6aa7d Made sure that the relation.X name is always added to the item for every relationship that it has 2018-11-06 11:34:50 +01:00
Raf Ponsaerts
eb0ea9a6bf Added relevant JavaDocs to public methods in altered classes 2018-10-26 08:48:33 +02:00
Raf Ponsaerts
f223f1c067 DSpace 7 Entities 2018-10-24 10:24:09 +02:00
Terry Brady
06ca8809e1 port PR 1867 2018-08-06 10:17:52 -07:00
Raf Ponsaerts
8ffbec58ca [DS-3782] Upgrade Commons Collections to version 4 2018-07-18 15:53:11 +02:00
Terry W Brady
8f689efc4e port pr 1862 2018-03-16 12:15:15 -07:00
Tim Donohue
8a48f782ea Fix dspace-api module per new code style 2018-02-21 15:23:58 -06:00
Tom Desair
a0433f72ef DS-3489: Added HAL link factories for AuthorityEntryResource and SubmissionSectionResource 2017-12-13 20:52:34 +01:00
Yana De Pauw
a588d42f5a DS-3406: Ordering sub communities and collections 2017-06-09 19:48:54 +00:00
Terry W Brady
172c0228c1 dao pagination support for item and bitstream 2017-03-13 11:53:24 -07:00
Ivan Masár
269af71afb javadoc (doclint) and whitespace fixes 
includes whitespace fixes as per Coding Conventions
 2016-11-10 13:34:37 +01:00
Mark H. Wood
98ae2bd071 [DS-3097] Bitstreams of embargoed and/or withdrawn items can be accessed by anyone 2016-09-01 15:06:44 -04:00