forked from IQSS/dataverse
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update from develop IQSS #46
Merged
lubitchv
merged 164 commits into
lubitchv:6650-export-import-mismatch
from
IQSS:develop
Mar 11, 2020
Merged
Update from develop IQSS #46
lubitchv
merged 164 commits into
lubitchv:6650-export-import-mismatch
from
IQSS:develop
Mar 11, 2020
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: pom.xml src/main/java/edu/harvard/iq/dataverse/api/Datasets.java src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
Note: DCM doesn't use any of the other S3 options in creating the Amazon client, so it is somewhat hardcoded that was as well. A rewrite might identify a specific s3 store to use, build the amazon client from it's settings and still use the general dcm-s3-bucket-name entry. If DCM should be supported across multiple stores, a dataverse.files.<id>.dcm-s3-bucket-name option could be created so that everything is ties to a specific store.
manageable by superuser only Conflicts: src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java src/main/java/edu/harvard/iq/dataverse/util/FileUtil.java
Conflicts: src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
and show a 'Use Default' label when not set
Thinking further, since setting the driver is superuser-only, it shouldn't be settable via the addDataverse API call (at least not without an additional security check, but even then, making the admin user make a separate call to set the driver via the already defined admin API call might be cleaner.
Conflicts: src/main/java/edu/harvard/iq/dataverse/dataaccess/DataAccess.java
Conflicts: src/main/java/edu/harvard/iq/dataverse/ingest/IngestServiceBean.java
the change to the inheritance model changed the meaning of getStorageDriverId() which now returns what is locally set on a dataverse. getEffectiveStorageDriverId() properly recurses as needed to find the effective one (and should never return null).
remove log4j 1.x (EOL)
…export-failure Iqss/6666 metadata export failure
4964 harvesting issues
6284 Added ui:param to guestbook-responses pg to fix header
#6682 add API Test Coverage button to README
#6703 update Citation Date Field Type stanzas
Updated Flyway Script Name
add release note text for coverage badge
match the start and end dataverse specific comment blocks in solr schema
Changed selector in analytics exmaple to be more precise [ref #6725]
…e-API-examples-provenance-metadata #6083 update examples in File part of Native API: 'Provenance' section.
…lytics-bug Iqss/6725 analytics bug
…e-API-examples-datafile-integrity #6083 update examples in File part of Native API: 'Datafile Integrity' section.
lubitchv
pushed a commit
that referenced
this pull request
Mar 27, 2023
* set default when no config is set for signposting * modification according to reviews * move long json string from code to bunddle * allow empty config on the level 2 profile * revision based on Herbert feedback * coding style cleanup SignpostingResources * remove leading comma * fix capitalize with header name
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it:
Which issue(s) this PR closes:
Closes #
Special notes for your reviewer:
Suggestions on how to test this:
Does this PR introduce a user interface change?:
Is there a release notes update needed for this change?:
Additional documentation: