DS-3294 #1496
DS-3294 #1496
Conversation
DS-2201: Unable to complete installation of DSpace with non-empty variable "db.schema" configuration file "build.properties"
…ils.getSchemaName() so that it can be replaced easily in future. Also cleaned up config comments
Fix DS-2427 for 5.1 by consolidating problematic schema code into DatabaseUtils...
…emptystring handling
…omplete name for the configuration parameter which determines the accessibility of usage statistics.
…nd pages from displaying for some URL patterns
(verbose error output, avoid NPE on JSP during an attack)
Adding class to ensure REST API can register itself during startup
DS-2936 REST-API /handle endpoint broken
Resolved: DSpaceDS-2998, Incorrect metadata element "dcterms.comformsTo" in dspace registry configuration. Ticket in the Space Issue Tracker: DS-2998
replace erroneous sql column with correct column
fixes previous commit
DS-3063 Add missing license headers
https://jira.duraspace.org/browse/DS-3085 Resolved: DSpace DS-3085 (Ticket in the Space Issue Tracker), Sherpa/Romeo ungraded journal (gray) shows error
…lean.valueOf() in SendItemRequestAction.java
|
Hi @wilee53, this PR looks to be invalid (includes a lot of unrelated commits), so I'm closing it. If you are trying to create a PR, you might want to ensure you are creating your branch off the latest master codebase...or perhaps rebase your branch on the latest master. More hints on PR creation at: |
|
Tim, Forked the DSpace project. What did I screw up? Should I have been working from master? Thanks for helping me out! On Fri, Aug 19, 2016 at 10:56 AM, Tim Donohue notifications@github.com
Human wheels spin round and round Bill Tantzen University of Minnesota Libraries |
|
Hi @wilee53, it sounds like the mistake was that you created the Pull Request against a different branch than you started from. So you checked out the "dspace-5.5" tag to create your branch, but then you created the PR against the "master" branch. So, instead, you should checkout "master" and branch off that (for your DS-3294 branch), and then create the PR against "master". Since it looks like your changes are in a single commit (3d10dcd), you may be able to just do this:
|
|
Tim, Bill On Fri, Aug 19, 2016 at 11:22 AM, Tim Donohue notifications@github.com
Human wheels spin round and round Bill Tantzen University of Minnesota Libraries |
|
"master" is the pre-6.0 release, which has undergone a massive API refactor. The 5.x and 6.0 APIs are not compatible. 5.5 is the latest release, but it's being managed over on the "dspace-5_x" branch, as we are working towards 6.0 on the "master" branch. If you'd rather just provide a patch for 5.x, you can submit your PR against the "dspace-5_x" branch (which is the latest 5.x code), but you have to specifically select that branch when creating the PR. In this PR, because you started with 5.x and then tried to submit your changes against the (highly refactored) master branch, GitHub got confused and did a diff of the 5.5 tag against master, creating this odd PR of mixmatched commits. GitHub essentially expects you to be creating PRs from the same branch you started with. So, if you start from "dspace-5_x" branch, create the PR against "dspace-5_x". If you start from "master" branch, create the PR against "master". Unfortunately, GitHub doesn't know how to handle situations where you start from "dspace-5_x" (which is essentially what you did in branching from 5.5 tag) and then creating a PR against "master". |
|
OK, good, I think I get it. I will try, try again! On Fri, Aug 19, 2016 at 12:14 PM, Tim Donohue notifications@github.com
Human wheels spin round and round Bill Tantzen University of Minnesota Libraries |
Fix DS-3294, request-a-copy for embargoed records, including ALL restricted items only requests a single bitstream. changed call to Boolean.getBoolean() with Boolean.valueOf() in SendItemRequestAction.java