Skip to content
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

Support for configurable list of licenses #7920

Merged
merged 228 commits into from
Feb 2, 2022
Merged

Commits on Mar 16, 2021

  1. First db table and api.

    JingMa87 committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    bc34031 View commit details
    Browse the repository at this point in the history
  2. Final changes for prototype.

    JingMa87 committed Mar 16, 2021
    Configuration menu
    Copy the full SHA
    5d08b0e View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. Add integration tests.

    JingMa87 committed Mar 18, 2021
    Configuration menu
    Copy the full SHA
    f9e3a3e View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2021

  1. Fix indentation.

    JingMa87 committed Mar 22, 2021
    Configuration menu
    Copy the full SHA
    5e3fb88 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2021

  1. Configuration menu
    Copy the full SHA
    0394652 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2021

  1. Configuration menu
    Copy the full SHA
    cb58637 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2021

  1. Add Apache icons.

    JingMa87 committed Mar 30, 2021
    Configuration menu
    Copy the full SHA
    dda1335 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2021

  1. Change tokens to licenses.

    JingMa87 committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    c87c367 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    67b7471 View commit details
    Browse the repository at this point in the history
  3. DD-387 Add license entity and api (#57)

    * First db table and api.
    
    * Final changes for prototype.
    
    * Add integration tests.
    
    * Fix indentation.
    
    * Add prototype of newest changes.
    
    * Add URI and URL objects, and new endpoints.
    
    * Add Apache icons.
    
    * Change tokens to licenses.
    
    * Change URIException to IllegalStateException.
    JingMa87 committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    4b6c367 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    784fdb0 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2021

  1. Configuration menu
    Copy the full SHA
    8a9974d View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2021

  1. Handle wrong JSON.

    JingMa87 committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    67178c9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c9d33e2 View commit details
    Browse the repository at this point in the history
  3. Reformat tabs.

    JingMa87 committed Apr 9, 2021
    Configuration menu
    Copy the full SHA
    f6c99eb View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2021

  1. Merged back develop

    janvanmansum committed Apr 14, 2021
    Configuration menu
    Copy the full SHA
    878ef6f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5bb0142 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2021

  1. Merge pull request #62 from JingMa87/dd-421-wrong-location-header

    DD-421 wrong location header
    PaulBoon committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    855f8a0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #67 from JingMa87/DD-424-post-wrong-json

    DD-424 post wrong json
    PaulBoon committed Apr 21, 2021
    Configuration menu
    Copy the full SHA
    41887c5 View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2021

  1. Merged back develop

    janvanmansum committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    d3da68b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    60292bb View commit details
    Browse the repository at this point in the history
  3. Merge pull request #66 from JingMa87/DD-425-missing-error-messages

    DD-425 missing error messages
    janvanmansum committed Apr 23, 2021
    Configuration menu
    Copy the full SHA
    5cee794 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2021

  1. Configuration menu
    Copy the full SHA
    49f5d0a View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2021

  1. added license info to publish dataset popup dialog

    mderuijter committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    0cf7359 View commit details
    Browse the repository at this point in the history
  2. Revert "added license info to publish dataset popup dialog"

    This reverts commit 0cf7359.
    mderuijter committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    245f04c View commit details
    Browse the repository at this point in the history
  3. added license info to publish dataset dialog

    mderuijter committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    6219010 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'blessed/multi-license' into dd-446-add-…

    …license-info-to-publish-dataset-dialog
    mderuijter committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    5280a50 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #61 from JingMa87/DD-422-posting-same-license-error

    DD-422 posting same license error
    PaulBoon committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    f670d73 View commit details
    Browse the repository at this point in the history
  6. added extra values to Bundle.properties

    mderuijter committed Apr 28, 2021
    Configuration menu
    Copy the full SHA
    13ec753 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2021

  1. Merge pull request #72 from mderuijter/dd-446-add-license-info-to-pub…

    …lish-dataset-dialog
    
    DD-446 add license info to publish dataset dialog
    PaulBoon committed Apr 29, 2021
    Configuration menu
    Copy the full SHA
    0273c0f View commit details
    Browse the repository at this point in the history

Commits on May 26, 2021

  1. DD-420 multi license UI (#73)

    * First changes for multi-license UI.
    
    * Add prototype multi-license support in UI.
    
    * Add TermsOfUse changes and Custom terms.
    
    * Revert adjustments in install.sh from last commit.
    
    * Remove old license code in TermsOfUseAndAccess and references to them.
    
    * Make Publish Dataset license fields conditional again.
    
    * Remove borders of fields in Publish Dataset.
    JingMa87 committed May 26, 2021
    Configuration menu
    Copy the full SHA
    83b21f0 View commit details
    Browse the repository at this point in the history
  2. Merged back develop

    janvanmansum committed May 26, 2021
    Configuration menu
    Copy the full SHA
    71f6be2 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2021

  1. retrieve active licenses only for dropdown list

    mderuijter committed May 31, 2021
    Configuration menu
    Copy the full SHA
    55bd5a1 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2021

  1. Merge pull request #78 from mderuijter/filter-inactive-licenses-from-…

    …dropdown-list
    
    DD-482 Filter inactive licenses from dropdown list
    janvanmansum committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    8f1969c View commit details
    Browse the repository at this point in the history
  2. added function to make sure custom fields are null when saving standa…

    …rd license
    mderuijter committed Jun 1, 2021
    Configuration menu
    Copy the full SHA
    ec4fd30 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2021

  1. Merge pull request #80 from mderuijter/dd-484-empty-custom-license-on…

    …ly-fields-before-saving-standard-license
    
    DD-484 empty custom license only fields before saving standard license
    janvanmansum committed Jun 3, 2021
    Configuration menu
    Copy the full SHA
    336359d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7dbd78d View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2021

  1. refreshes to propper logo&url on item select

    mderuijter committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    e28e4e0 View commit details
    Browse the repository at this point in the history
  2. refactored render statement

    mderuijter committed Jun 7, 2021
    Configuration menu
    Copy the full SHA
    832e4f6 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2021

  1. Merge pull request #81 from mderuijter/dd-485-update-license-logo-and…

    …-description-on-dropdown-change
    
    DD-485 update license logo and description on dropdown change
    PaulBoon committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    b1fb21f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    74cd21b View commit details
    Browse the repository at this point in the history
  3. newline at end of file

    mderuijter committed Jun 8, 2021
    Configuration menu
    Copy the full SHA
    9ad49e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2021

  1. WIP

    janvanmansum committed Jun 9, 2021
    Configuration menu
    Copy the full SHA
    7d5c0d1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7676ab5 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2021

  1. Started with docs

    janvanmansum committed Jun 11, 2021
    Configuration menu
    Copy the full SHA
    8915c06 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2021

  1. Docs in progress

    janvanmansum committed Jun 12, 2021
    Configuration menu
    Copy the full SHA
    17616c4 View commit details
    Browse the repository at this point in the history
  2. Tabs -> spaces

    janvanmansum committed Jun 12, 2021
    Configuration menu
    Copy the full SHA
    918c86f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    8cc996a View commit details
    Browse the repository at this point in the history
  4. Merge pull request #85 from janvanmansum/CLEANUP_LICENSE_API

    Cleanup and document license api
    janvanmansum committed Jun 12, 2021
    Configuration menu
    Copy the full SHA
    ec37254 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    2ecba09 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2021

  1. Merge pull request #82 from mderuijter/dd-486-termsofuseandaccess-fly…

    …way-upgrade-script
    
    DD-486 Create V5.5.0.3__7440-multi-license-add-column-to-termsofuseandaccess…
    janvanmansum committed Jun 16, 2021
    Configuration menu
    Copy the full SHA
    58b623e View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2021

  1. Configuration menu
    Copy the full SHA
    5b68e53 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2021

  1. Merge pull request #90 from janvanmansum/multi-license

    DD-511 Open links to license in new tab
    janvanmansum committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    a980c5e View commit details
    Browse the repository at this point in the history
  2. DD-513. Added database setting :AllowCustomTerms (#91)

    Co-authored-by: Jan van Mansum <janvanmansum@users.noreply.github.com>
    janvanmansum and janvanmansum committed Jun 18, 2021
    Configuration menu
    Copy the full SHA
    c34bd3e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6313887 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2021

  1. Configuration menu
    Copy the full SHA
    5c72dca View commit details
    Browse the repository at this point in the history
  2. Merge pull request #92 from janvanmansum/REFACTOR_LICENSE_UNIQUENESS

    Replaced redundant (and incomplete) uniqueness check with try-cath around database call
    janvanmansum committed Jun 19, 2021
    Configuration menu
    Copy the full SHA
    9895ddd View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1b8765e View commit details
    Browse the repository at this point in the history
  4. WIP

    janvanmansum committed Jun 19, 2021
    Configuration menu
    Copy the full SHA
    d9e61a5 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #93 from janvanmansum/ADD_CC0_VIA_FLYWAY

    Add cc0 via flyway
    janvanmansum committed Jun 19, 2021
    Configuration menu
    Copy the full SHA
    e45b74c View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2021

  1. DD-515. Don't allow a referenced license to be deleted through the co…

    …nfiguration API (#94)
    
    * DD-515. Display decent message when trying to delete referenced license.
    
    * Improved message
    
    Co-authored-by: Jan van Mansum <janvanmansum@users.noreply.github.com>
    janvanmansum and janvanmansum committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    1a9fe2e View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. DD-521 Default license (#95)

    * WiP
    
    * Wip
    
    * Fixes
    
    Co-authored-by: Jan van Mansum <janvanmansum@users.noreply.github.com>
    janvanmansum and janvanmansum committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    6516186 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2021

  1. Merged back develop

    janvanmansum committed Jun 30, 2021
    Configuration menu
    Copy the full SHA
    2497228 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1e1e0f6 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    6840329 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2021

  1. DD-527 Restructure license and custom terms in dataset JSON (#97)

    * Update JsonPrinter.java
    
    * Restructured DatasetVersion license in JsonPrinter.java
    mderuijter committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    fab2f99 View commit details
    Browse the repository at this point in the history
  2. DD-526 create url for custom terms (#99)

    * updated Datasets.java, DatasetPage.java and dataset.xhtml
    
    * refactored getCustomTermsTab function, added logic to switch to all dataset tabs
    
    * allow guestaccess and return 404 if no custom license
    mderuijter committed Jul 8, 2021
    Configuration menu
    Copy the full SHA
    20e4360 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2021

  1. added EditMode check to setLicense

    mderuijter committed Jul 9, 2021
    Configuration menu
    Copy the full SHA
    0dc8e80 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2021

  1. updated flyway script

    mderuijter committed Jul 13, 2021
    Configuration menu
    Copy the full SHA
    0a187ee View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2021

  1. Merge pull request #100 from mderuijter/dd-548-defaults-to-custom-bugfix

    DD-548 added EditMode check to setLicense
    janvanmansum committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    5b952b1 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #102 from mderuijter/dd-522-update-termsofuseandac…

    …cess-flyway-script
    
    DD-522 License flyway script must update existing records in termsofuseandaccess table
    janvanmansum committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    d425ec7 View commit details
    Browse the repository at this point in the history
  3. changed bundle property file.dataFilesTab.terms.list.termsOfUse.waive…

    …r.description text
    mderuijter committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    4c12a7e View commit details
    Browse the repository at this point in the history
  4. Merge pull request #104 from mderuijter/dd-533-improve-ui-text-licens…

    …e-field
    
    DD-533 improve UI text license field
    janvanmansum committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    c2e7375 View commit details
    Browse the repository at this point in the history
  5. DD-526 create url for custom terms (#103)

    * updated Datasets.java, DatasetPage.java and dataset.xhtml
    
    * refactored getCustomTermsTab function, added logic to switch to all dataset tabs
    
    * allow guestaccess and return 404 if no custom license
    
    * changed custom url response to 303 see other
    mderuijter committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    fd21968 View commit details
    Browse the repository at this point in the history
  6. DD-525 add short description (#101)

    * added license shortDescription, and UI shortDescription to publish dialog
    
    * fixed issue, shortdescription was not saving when updating license
    
    * compilation check fix
    
    * added short description tooltip for license url & image
    mderuijter committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    4518fd6 View commit details
    Browse the repository at this point in the history
  7. Merge back develop (#105)

    * initial semantic API endpoint
    
    * merge new fields with existing ones
    
    * differences from IQSS/develop that break compilation
    
    * Add jsonld lib to compact to local context
    
    * use expand/compact, refactor, add :startmigration endpoint
    
    * try fix for parse error
    
    * log value
    
    * return dataset
    
    * manage versionState, add debug output
    
    * move debug ore generation after configuring dataset
    
    * set versionstate, simplify, move terms init outside loop
    
    * parse version number
    
    * fix toStrings
    
    * debug null pointer in DataverseFieldTypeInputLevel
    
    * add support for fields with their own formal URI
    
    * allow non-published to support debugging and future use
    
    * refactor, use expanded version directly
    
    * add modification time
    
    * expanded has array with 1 val - handle it
    
    * log compound values to start
    
    * compact with no context for decontextualize
    
    * handle appending and compound fields
    
    * sort compound field children by display order
    
    * parse date/time correctly
    
    * Revert "sort compound field children by display order"
    
    This reverts commit 8596ac8.
    
    * typo
    
    * now use Uri instead of label when matching terms
    
    * set dsfield of dsfvalue
    
    * additional debug, always set display order
    
    * generate URIs for child types to match current ore maps
    
    * allow oremap to work w/o modified date for debug
    
    * null check on date itself
    
    * fix compound value iteration
    
    don't replace existing value - always add a new value, but, if not
    appending, clear the list of values to start
    
    * fix ttype map for terms with no uri - use title not name
    
    as is done currently in generating the ORE map
    
    * handle date format variations, including DV internal ones
    
    see note in Dataverses - using Date() versus Timestamp() causes a
    difference in precision and, perhaps surprisingly, a difference in the
    response from version.getLastUpdateTime().toString() in creating the
    OREmap.
    
    * and the format in current published bags
    
    * initial endpoint to release a migrated dataset
    
    * create metadataOnOrig field
    
    * add metadataOnOrig to solr
    
    * use Finalize Publication command
    
    Curate is for cases with an existing published version and migrated
    datasets only have 1 version
    
    Also - don't want to go through Publish command since it creates new
    version numbers, etc.
    
    * add debug, allow more details in 400 responses
    
    * fix date-time issue
    
    * typos
    
    * create transfer bag type with orig files
    
    handle no checksums on orig files
    
    * missing tab
    
    * add type param
    
    * add semantic metadata api call only
    
    * remove OREMap parameter
    
    * fix error handling
    
    FWIW: We have an error handler for the
    edu.harvard.iq.dataverse.util.json.JsonParseException class but not for
    javax.json.stream.JsonParsingException which was getting caught by the
    Throwable handler and returned as a 500 error with json message {}
    
    * append to current terms
    
    * add replace param
    
    * handle append on terms - fix cut/paste errors
    
    * fix logic
    
    * specify default
    
    * make replace still append for multiple val fields
    
    * add migrating switch
    
    * expose uri in datasetField api
    
    * track defined namespaces
    
    and avoid having contexts with specific entries for terms that are in a
    namespace already
    
    * define equals, avoid duplicates in list
    
    * replace string with const
    
    * constant for CC0_URI
    
    * GET/DELETE endpoints
    
    * 7130-handle missing contact name
    
    * Fix multiple description logic for info file
    
    * put is always for :draft version
    
    * don't cast to String[]
    
    * add more logging
    
    * handle unpublished versions
    
    * add method that can return JsonObjectBuilder
    
    which can be used with existing AbstractApiBean.ok()
    
    * log details on failure
    
    * multiple updates/fixes, added logging
    
    * fix terms retrieval
    
    * date test fixes for locale
    
    * Java 11 update and test fixes inc. for different exception mesg
    
    * update pom for v11 and running tests under 11
    
    * fix for edu.harvard.iq.dataverse.api.AdminIT test fail in Java 11
    
    The DV code tested in testLoadMetadataBlock_ErrorHandling assumed it
    could parse the message of an ArrayOutOfBounds exception as an it to
    determine the column that fails. This message is now a String. Rather
    than parse it (and fail if it changes), I modified the code so that the
    length of the values array is visible in the catch and can be sent
    directly (the first out of bounds index is if/when the index is
    values.length).
    
    * flyway script adding the new constraint (IQSS#7451)
    
    * A diagnostics script, to check and fix any duplicated harvested storageidentifiers, and re-check the local ones for any new dupes, just in case. (IQSS#7451)
    
    * A pre-release text for the new diagnostics script (will discuss the approach in the PR/dv-tech) (IQSS#7451)
    
    * Arming the script bomb... (IQSS#7451)
    
    * switched to a conditional constraint. (IQSS#7451)
    
    * Update PRE-RELEASE-INFO.txt
    
    * update StringUtils package
    
    * Do not count thumbnails and prep downloads, when redirecting to S3 (similarly to how these downloads are treated when done internally, without redirecting to the remote bucket, in line 457). IQSS#7924
    
    * Implement usage of user supplied handle for authentication. This is an optional parameter.
    
    * Fix mising ";" coding error.
    
    * move metadataOnOrig out of citation block
    
    which makes it optional
    
    * IQSS#7431 remove XML prolog from the individual records of OAI-PMH ListRecords response
    
    * IQSS#7431 adding integration tests
    
    * Bump httpclient from 4.5.5 to 4.5.13
    
    Bumps httpclient from 4.5.5 to 4.5.13.
    
    ---
    updated-dependencies:
    - dependency-name: org.apache.httpcomponents:httpclient
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    
    * More forceful language in the "pre-release note" about the dvobject constraint
    being enforced on existing databases in the next release. (IQSS#7451)
    
    * renamed the flyway script for the dvobject constraint (since it didn't make it into 5.5) (IQSS#7451)
    
    * Better check HandleAuthHandle for default value of null. If unequal to null then use it.
    
    * Change "string" to "String" with uppercase first character
    
    * build(ci): atempt to fix coveralls report. IQSS#7977
    
    * Change parameter "HandleAuthHandle" so it start with a lower case character when it is being assigned.
    
    * Update 5.3-release-notes.md
    
    Removed incorrect statement: (If you are using a PostgreSQL server on `localhost:5432`, you can omit `dataverse.db.host` and `dataverse.db.port`.)
    
    * sync with migration api branch (tests, docs, bug fixes)
    
    * rename SQL update script IQSS#7451
    
    * prevent page from blowing up if no remind msg in bundle IQSS#7975
    
    * get "create dataset" working again IQSS#7986
    
    * remove TODO IQSS#7986
    
    Per comment from Jim: "This works and doesn't break the anonymized
    access functionality as I thought it might."
    
    * add anonymized access methods
    
    * fix test
    
    * Update doc/release-notes/6497-semantic-api.md
    
    Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
    
    * Update doc/sphinx-guides/source/developers/dataset-semantic-metadata-api.rst
    
    Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
    
    * add create example, remove solr schema copies file
    
    * removed debug logging
    
    * missing header
    
    * Added an extra clause for some IQSS-specific harvested identifiers.
    Extremely unlikely to be encountered anywhere else; but need to be
    included to be able to QA on a copy of the prod. db.
    Plus some extr diagnostics. (IQSS#7451)
    
    * IQSS#7893 link Rserve documentation to necessary files in Dataverse repo
    
    * IQSS#7893 remove redundant script mention per feedback from Leonid
    
    * Adding -H + API token to curl commands
    
    Without ``-H`` and the API token in these curl commands, the native API rejects the user's requests on the ground that they are a 'guest'.
    
    * remove metadataOnOrig per review
    
    * IQSS#7893 use fixedwidthplain text instead, clone master instead of develop
    
    * fixes the small formatting issue with the link (IQSS#7893)
    
    * Update doc/sphinx-guides/source/api/native-api.rst
    
    Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
    
    * Update doc/sphinx-guides/source/api/native-api.rst
    
    Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
    
    * Update doc/sphinx-guides/source/api/native-api.rst
    
    Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
    
    * Update doc/sphinx-guides/source/api/native-api.rst
    
    Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
    
    * Update documentation to be more consise about the handle and give a better example.
    
    * IQSS#7936 append deaccessionDialog.reasons with periods for proper display
    
    * add missing create method (in migrate PR)
    
    * No "@id" npe fix
    
    * avoid npe in logging
    
    * only require "@id" when migrating
    
    * fix logging in create case
    
    * WIP
    
    * Temporary conflict solution
    
    * Added marker comments where code must be revised/fixed later '// TODO: FIX FOR MULTI-LICENSE'
    
    Co-authored-by: qqmyers <qqmyers@hotmail.com>
    Co-authored-by: Leonid Andreev <leonid@hmdc.harvard.edu>
    Co-authored-by: Gustavo Durand <scolapasta+github@gmail.com>
    Co-authored-by: Robert Verkerk <robert.verkerk@surfsara.nl>
    Co-authored-by: pkiraly <pkiraly@gwdg.de>
    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
    Co-authored-by: Oliver Bertuch <o.bertuch@fz-juelich.de>
    Co-authored-by: Kevin Condon <kcondon@hmdc.harvard.edu>
    Co-authored-by: Philip Durbin <philip_durbin@harvard.edu>
    Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
    Co-authored-by: Don Sizemore <don.sizemore@gmail.com>
    Co-authored-by: Benjamin Peuch <benjamin.peuch@gmail.com>
    Co-authored-by: Jan van Mansum <janvanmansum@users.noreply.github.com>
    14 people committed Jul 14, 2021
    Configuration menu
    Copy the full SHA
    19f3eac View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2021

  1. DD-528 Adapt metadata export to show new license info (#106)

    * fixed all multi-license TODO's, there's a bug in metadata export now
    
    * added LicenseDTO to fix exporting, modified dependant tests
    
    * changed tabs to spaces
    
    * added LicenseDTO to fix exporting, modified dependant tests
    
    * code refactoring and test modification
    mderuijter committed Jul 24, 2021
    Configuration menu
    Copy the full SHA
    7df29a1 View commit details
    Browse the repository at this point in the history
  2. DD-553 Default licenses can be deleted (#107)

    * added a isDefault check before license deletion
    
    * changed Bad Request to Conflict for delete License call
    
    * changed bad request to not found error for delete license call
    mderuijter committed Jul 24, 2021
    Configuration menu
    Copy the full SHA
    f8270de View commit details
    Browse the repository at this point in the history
  3. Resolved merge conflicts

    janvanmansum committed Jul 24, 2021
    Configuration menu
    Copy the full SHA
    6cc86e0 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    352e6b4 View commit details
    Browse the repository at this point in the history
  5. Updated example config

    janvanmansum committed Jul 24, 2021
    Configuration menu
    Copy the full SHA
    a5e0125 View commit details
    Browse the repository at this point in the history
  6. Decrease diff

    janvanmansum committed Jul 24, 2021
    Configuration menu
    Copy the full SHA
    046df42 View commit details
    Browse the repository at this point in the history
  7. Decrease diff

    janvanmansum committed Jul 24, 2021
    Configuration menu
    Copy the full SHA
    f93e45f View commit details
    Browse the repository at this point in the history
  8. Decrease diff

    janvanmansum committed Jul 24, 2021
    Configuration menu
    Copy the full SHA
    56c12c4 View commit details
    Browse the repository at this point in the history
  9. Decrease diff

    janvanmansum committed Jul 24, 2021
    Configuration menu
    Copy the full SHA
    924e166 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    e499435 View commit details
    Browse the repository at this point in the history
  11. Decreased import diffs

    janvanmansum committed Jul 24, 2021
    Configuration menu
    Copy the full SHA
    417b875 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    0dd15b0 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2021

  1. urlIcon element does not disploy if empty now

    mderuijter committed Jul 27, 2021
    Configuration menu
    Copy the full SHA
    46f675e View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2021

  1. added api call GET /licenses/default

    mderuijter committed Jul 28, 2021
    Configuration menu
    Copy the full SHA
    9223a3e View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2021

  1. removed termsofuseandacces.license column

    mderuijter committed Aug 16, 2021
    Configuration menu
    Copy the full SHA
    9f58548 View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2021

  1. Merge pull request #112 from mderuijter/dd-562-implement-GET-api-admi…

    …n-licenses-default
    
    DD-562 Implement GET /api/admin/licenses/default
    janvanmansum committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    31d7470 View commit details
    Browse the repository at this point in the history
  2. DD-573 Implement set license in semantic api (#113)

    * implemented set license via semantic API
    
    * fixed some of the required logic
    mderuijter committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    925a1c3 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #114 from mderuijter/dd-549-removed-termsofuseanda…

    …ccess-license-column
    
    DD-549 Is field/column termsofuseandaccess.license still necessary?
    janvanmansum committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    556be4a View commit details
    Browse the repository at this point in the history
  4. Merge pull request #110 from mderuijter/dd-552-remove-reference-to-wa…

    …iver
    
    DD-552 Remove references to "waiver" from code and UI
    janvanmansum committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    051f75d View commit details
    Browse the repository at this point in the history
  5. Merged back develop

    janvanmansum committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    b001bf1 View commit details
    Browse the repository at this point in the history
  6. Renum flyway script

    janvanmansum committed Sep 10, 2021
    Configuration menu
    Copy the full SHA
    47cabe1 View commit details
    Browse the repository at this point in the history

Commits on Sep 15, 2021

  1. DD-561 Updated SwordServiceBean to support multi-license (#118)

    * Updated SwordServiceBean to support multi-license
    mderuijter committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    60cb2ea View commit details
    Browse the repository at this point in the history
  2. DD-593 integration test fixes multi license (#116)

    * fixing AdminIT license tests
    
    * changed hardcoded license ID to always pick the last added license
    mderuijter committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    06c8574 View commit details
    Browse the repository at this point in the history
  3. Merged back develop

    janvanmansum committed Sep 15, 2021
    Configuration menu
    Copy the full SHA
    9192f35 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6a708fc View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2021

  1. Configuration menu
    Copy the full SHA
    741f255 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2021

  1. Configuration menu
    Copy the full SHA
    6ad3bc3 View commit details
    Browse the repository at this point in the history

Commits on Oct 6, 2021

  1. Merge pull request #125 from janvanmansum/DD-529

    DD-529 Fixes in JSONLDUtil
    janvanmansum committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    a421aba View commit details
    Browse the repository at this point in the history
  2. implementing change requests

    mderuijter committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    5151b94 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    896c02a View commit details
    Browse the repository at this point in the history
  4. implemented change requests

    mderuijter committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    fae7475 View commit details
    Browse the repository at this point in the history
  5. Merge remote-tracking branch 'upstream/develop' into dd-617-change-re…

    …quests-multi-license-pr
    mderuijter committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    cea9c17 View commit details
    Browse the repository at this point in the history
  6. fix flyway numbering

    qqmyers committed Oct 6, 2021
    Configuration menu
    Copy the full SHA
    e21ee3b View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. Configuration menu
    Copy the full SHA
    9840eb3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    83e8dfe View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'blessed/multi-license' into dd-617-chan…

    …ge-requests-multi-license-pr
    mderuijter committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    1002e87 View commit details
    Browse the repository at this point in the history
  4. simplified multi-license code for OpenAIRE export

    mderuijter committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    7cafa70 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2021

  1. Merge pull request #127 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    Fix flyway numbering
    janvanmansum committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    9cb9518 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #126 from mderuijter/dd-617-change-requests-multi-…

    …license-pr
    
    DD-617 change requests multi license pr
    janvanmansum committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    ef2e276 View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2021

  1. Merged back develop

    janvanmansum committed Oct 22, 2021
    Configuration menu
    Copy the full SHA
    d2c61b3 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2021

  1. DD-648 fix for allow custom terms (#130)

    * only sets custom license when allowed or default license when not, fixed broken tests
    
    * fixed imports
    
    * refactored exception handling for JsonParser.parseLicense method
    mderuijter committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    6159d19 View commit details
    Browse the repository at this point in the history
  2. update flyway numbering

    qqmyers committed Oct 26, 2021
    Configuration menu
    Copy the full SHA
    91a5fab View commit details
    Browse the repository at this point in the history

Commits on Oct 27, 2021

  1. Merge pull request #132 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    update flyway numbering
    janvanmansum committed Oct 27, 2021
    Configuration menu
    Copy the full SHA
    e55b12e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4cbaa01 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2021

  1. Merge pull request #133 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    Also need to handle new install where license column doesn't exist
    janvanmansum committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    f5ee336 View commit details
    Browse the repository at this point in the history
  2. DD-647 fixed/refactored exception handling (#131)

    * fixed/refactored exception handling
    
    * organized imports
    
    * Revert "organized imports"
    
    This reverts commit 87af77c.
    
    * fixed import-diffs
    mderuijter committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    a55304c View commit details
    Browse the repository at this point in the history
  3. refactored code

    mderuijter committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    ff5fcaf View commit details
    Browse the repository at this point in the history
  4. Merge pull request #134 from mderuijter/dd-681-refactoring-code

    DD-681 Refactored Multi-License Code
    janvanmansum committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    97ff410 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2021

  1. DD-683 UI Change Requests Multi License (#135)

    * implemented changes
    
    * implemented change requests
    mderuijter committed Nov 2, 2021
    Configuration menu
    Copy the full SHA
    1c4ee43 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2021

  1. Merged back develop

    janvanmansum committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    f994923 View commit details
    Browse the repository at this point in the history
  2. Resolved conflict

    janvanmansum committed Nov 9, 2021
    Configuration menu
    Copy the full SHA
    1d575bd View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2021

  1. Configuration menu
    Copy the full SHA
    a79143e View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2021

  1. Configuration menu
    Copy the full SHA
    b87e19a View commit details
    Browse the repository at this point in the history
  2. rst formatting

    janvanmansum committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    c9bf631 View commit details
    Browse the repository at this point in the history
  3. Renumbered Flyway script

    janvanmansum committed Nov 22, 2021
    Configuration menu
    Copy the full SHA
    150a393 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2021

  1. Configuration menu
    Copy the full SHA
    1a7def0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    de506ee View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2021

  1. Configuration menu
    Copy the full SHA
    19f9edf View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2021

  1. Configuration menu
    Copy the full SHA
    73e6fc8 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2021

  1. Configuration menu
    Copy the full SHA
    1065610 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    727c997 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2021

  1. Configuration menu
    Copy the full SHA
    76a12d1 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2021

  1. Configuration menu
    Copy the full SHA
    0618c14 View commit details
    Browse the repository at this point in the history
  2. Renumbered flyway script

    janvanmansum committed Dec 12, 2021
    Configuration menu
    Copy the full SHA
    1f81a45 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2021

  1. Configuration menu
    Copy the full SHA
    9cf8e6d View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2021

  1. Configuration menu
    Copy the full SHA
    5045950 View commit details
    Browse the repository at this point in the history
  2. cleanup/merge

    qqmyers committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    3d70aeb View commit details
    Browse the repository at this point in the history
  3. fix for DD-696

    add message area, remove required check which interferes with switching
    back from custom to another license, make validator message come from
    method, update method to check the licenseId (in the form) and only
    validate for custom licenseId==null
    qqmyers committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    525add2 View commit details
    Browse the repository at this point in the history
  4. updating string names/values

    qqmyers committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    a4eb99e View commit details
    Browse the repository at this point in the history
  5. move license name/uri code

    qqmyers committed Dec 15, 2021
    Configuration menu
    Copy the full SHA
    af8cba7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    dea8f13 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2021

  1. custom link on dataset page

    qqmyers committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    2be06ef View commit details
    Browse the repository at this point in the history
  2. Language tweak

    qqmyers committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    0fc0124 View commit details
    Browse the repository at this point in the history
  3. cleanup

    qqmyers committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    59c4b25 View commit details
    Browse the repository at this point in the history
  4. switch to using License objects directly in select menu

    start to making mLicense changes in Templates
    qqmyers committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    d04cfce View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    019dd94 View commit details
    Browse the repository at this point in the history
  6. get license selections from service, add caching, clear in terms

    Together these changes remove the last parts of dataset-license that
    relied on the DatasetPage for license selection which allows templates
    to work correctly with multilicense. Changes here include
    
    getting license selections from the LicenseServiceBean
    removing code for caching license state and selections from DatasetPage
    caching the list of licenses in SettingsWrapper
    clearing the terms that aren't allowed with a non-null/non-custom
    license in the TermsOfUseAndAccess class itself as part of setting the
    license
    minor optimization in the same class to not copy those terms if there is
    a non-null license.
    qqmyers committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    2438185 View commit details
    Browse the repository at this point in the history
  7. remove unused method

    qqmyers committed Dec 16, 2021
    Configuration menu
    Copy the full SHA
    e1be751 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2021

  1. Configuration menu
    Copy the full SHA
    3da511a View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2021

  1. Configuration menu
    Copy the full SHA
    9c15773 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c8b4ef7 View commit details
    Browse the repository at this point in the history
  3. Typos an layout

    janvanmansum committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    a213ab4 View commit details
    Browse the repository at this point in the history
  4. Fix doc generation error

    janvanmansum committed Dec 20, 2021
    Configuration menu
    Copy the full SHA
    119eca8 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2022

  1. Fix error response/tests

    Runtime errors returned from a bean trigger a transaction rollback
    exception and either those exceptions have to be caught (i.e. as in
    https://github.com/IQSS/dataverse/blob/e7be5947abf2fbaa9ceaac09b27a60d439647f24/src/main/java/edu/harvard/iq/dataverse/search/SearchServiceBean.java#L354-L357)
    or some non-runtime exception has to be returned. I used the
    WrappedResponse class as a way to simplify but reviewers may have some
    other preference (e.g. just catch the transaction exceptions as in the
    SearchServiceBean or use non-runtime exceptions directly in the
    LicenseServiceBean class). Any of these should assure a non-null
    response is returned which in turn should allow the AdminIt tests to
    pass.
    qqmyers committed Jan 3, 2022
    Configuration menu
    Copy the full SHA
    f838f74 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2022

  1. Merge pull request #137 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    Fix error response/AdminITlicense tests
    janvanmansum committed Jan 4, 2022
    Configuration menu
    Copy the full SHA
    5a582f3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    61e327e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0cfe058 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2022

  1. remove obsolete tests

    editing existing licenses is no longer allowed, so tests not needed
    (were failing with
    {
      "status":"ERROR",
      "code":405,
      "message":"API endpoint does not support this method. Consult our API
    guide at http://guides.dataverse.org.",
      "requestUrl":"http://localhost:8080/api/v1/admin/licenses/4",
      "requestMethod":"PUT"
    }
    qqmyers committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    529c5d0 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #138 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    remove obsolete tests
    janvanmansum committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    1c50160 View commit details
    Browse the repository at this point in the history
  3. Merge remote-tracking branch 'IQSS/develop' into DANS/multi-license

    Conflicts:
    	src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
    qqmyers committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    9a4fa8d View commit details
    Browse the repository at this point in the history
  4. potential fix for the build error

    this is a difference from develop and looks related to the Jacoco error
    in the build log. Since it doesn't look related to the branch, let's
    revert.
    qqmyers committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    b6c2d80 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #139 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    Merge/fix build
    janvanmansum committed Jan 5, 2022
    Configuration menu
    Copy the full SHA
    842f0a8 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2022

  1. Merged back develop

    janvanmansum committed Jan 6, 2022
    Configuration menu
    Copy the full SHA
    4bbd51a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b1880cb View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2022

  1. Update doc/release-notes/7440-multilicense.md

    Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
    janvanmansum and pdurbin committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    dbdc031 View commit details
    Browse the repository at this point in the history
  2. Update doc/release-notes/7440-multilicense.md

    Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
    janvanmansum and pdurbin committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    e83e3d7 View commit details
    Browse the repository at this point in the history
  3. Update doc/release-notes/7440-multilicense.md

    Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
    janvanmansum and pdurbin committed Jan 7, 2022
    Configuration menu
    Copy the full SHA
    2ed5680 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2022

  1. update license api and tests

    qqmyers committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    3d26262 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    c10530c View commit details
    Browse the repository at this point in the history
  3. fix/simplify refactor

    qqmyers committed Jan 10, 2022
    Configuration menu
    Copy the full SHA
    b6d170b View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. update docs

    qqmyers committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    513c011 View commit details
    Browse the repository at this point in the history
  2. remove unused query

    qqmyers committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    2fac0e8 View commit details
    Browse the repository at this point in the history
  3. add braces for ifs, fix text

    qqmyers committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    02a04bd View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    27a607f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    a6687a0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    663bde9 View commit details
    Browse the repository at this point in the history
  7. add comments re: URI logic

    qqmyers committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    a183b4a View commit details
    Browse the repository at this point in the history
  8. note compatibility issues

    qqmyers committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    3e897e8 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    632b71d View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    5ef1972 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    dc08712 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    7bcfa0e View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    9131e96 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    e8c9fc9 View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    5cf2bd4 View commit details
    Browse the repository at this point in the history
  16. fix auto-change

    qqmyers committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    8f2624b View commit details
    Browse the repository at this point in the history
  17. reformat

    qqmyers committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    1e2e83b View commit details
    Browse the repository at this point in the history
  18. typo/extra chars

    qqmyers committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    76a789b View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2022

  1. Merge pull request #140 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    Multi license
    janvanmansum committed Jan 12, 2022
    Configuration menu
    Copy the full SHA
    1c79279 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2022

  1. merged back develop

    janvanmansum committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    aee5d76 View commit details
    Browse the repository at this point in the history
  2. fix json lincese object and typo

    forgot to change this back after realizing we needed the uri for other
    exports
    
    also - termsofUse capitalization messed with DDI export
    qqmyers committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    fb60c1f View commit details
    Browse the repository at this point in the history
  3. fix respecting custom terms property

    FWIW: the rendered attribute isn't supported on selectItem elements
    qqmyers committed Jan 13, 2022
    Configuration menu
    Copy the full SHA
    5623537 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2022

  1. typo

    qqmyers committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    7bdf6b6 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5d1b8e1 View commit details
    Browse the repository at this point in the history
  3. unreachable code

    qqmyers committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    dad5fc8 View commit details
    Browse the repository at this point in the history
  4. add terms to download popup

    qqmyers committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    91fba7c View commit details
    Browse the repository at this point in the history
  5. css for download popup

    qqmyers committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    eeab710 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    0b667be View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b097628 View commit details
    Browse the repository at this point in the history
  8. Merge remote-tracking branch 'IQSS/develop' into DANS/multi-license

    Conflicts:
    	src/main/webapp/dataset-license-terms.xhtml
    qqmyers committed Jan 14, 2022
    Configuration menu
    Copy the full SHA
    3d71fc9 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2022

  1. Merge pull request #141 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    Bug/regression fixes, add terms in download dialog
    janvanmansum committed Jan 15, 2022
    Configuration menu
    Copy the full SHA
    a85765d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    304371c View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2022

  1. Configuration menu
    Copy the full SHA
    e4e9f0e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ec3965e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4175f4b View commit details
    Browse the repository at this point in the history
  4. tweak text

    qqmyers committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    075d55b View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    d4ef070 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    fb309dd View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2022

  1. Merge pull request #142 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    Review changes
    janvanmansum committed Jan 24, 2022
    Configuration menu
    Copy the full SHA
    860b08f View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2022

  1. fix NPE in DC export

    qqmyers committed Jan 26, 2022
    Configuration menu
    Copy the full SHA
    4433533 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7a176a5 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9526963 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4665ac7 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2022

  1. Merge pull request #143 from GlobalDataverseCommunityConsortium/DANS/…

    …multi-license
    
    QA fixes
    janvanmansum committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    54bf74c View commit details
    Browse the repository at this point in the history
  2. format fixes

    qqmyers committed Jan 27, 2022
    Configuration menu
    Copy the full SHA
    7721ca9 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2022

  1. Configuration menu
    Copy the full SHA
    55f7d0d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    334bb48 View commit details
    Browse the repository at this point in the history
  3. Merge pull request #144 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    Retry updates
    janvanmansum committed Jan 28, 2022
    Configuration menu
    Copy the full SHA
    20b3142 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    667c1b0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    148fbcd View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    fd8946c View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2022

  1. Merge pull request #145 from GlobalDataverseCommunityConsortium/multi…

    …-license
    
    ~final QA updates
    janvanmansum committed Jan 31, 2022
    Configuration menu
    Copy the full SHA
    e6d449a View commit details
    Browse the repository at this point in the history