-
Notifications
You must be signed in to change notification settings - Fork 482
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
Commits on Mar 16, 2021
-
Configuration menu - View commit details
-
Copy full SHA for bc34031 - Browse repository at this point
Copy the full SHA bc34031View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d08b0e - Browse repository at this point
Copy the full SHA 5d08b0eView commit details
Commits on Mar 18, 2021
-
Configuration menu - View commit details
-
Copy full SHA for f9e3a3e - Browse repository at this point
Copy the full SHA f9e3a3eView commit details
Commits on Mar 22, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 5e3fb88 - Browse repository at this point
Copy the full SHA 5e3fb88View commit details
Commits on Mar 24, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 0394652 - Browse repository at this point
Copy the full SHA 0394652View commit details
Commits on Mar 25, 2021
-
Configuration menu - View commit details
-
Copy full SHA for cb58637 - Browse repository at this point
Copy the full SHA cb58637View commit details
Commits on Mar 30, 2021
-
Configuration menu - View commit details
-
Copy full SHA for dda1335 - Browse repository at this point
Copy the full SHA dda1335View commit details
Commits on Mar 31, 2021
-
Configuration menu - View commit details
-
Copy full SHA for c87c367 - Browse repository at this point
Copy the full SHA c87c367View commit details -
Configuration menu - View commit details
-
Copy full SHA for 67b7471 - Browse repository at this point
Copy the full SHA 67b7471View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 4b6c367 - Browse repository at this point
Copy the full SHA 4b6c367View commit details -
Configuration menu - View commit details
-
Copy full SHA for 784fdb0 - Browse repository at this point
Copy the full SHA 784fdb0View commit details
Commits on Apr 1, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 8a9974d - Browse repository at this point
Copy the full SHA 8a9974dView commit details
Commits on Apr 9, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 67178c9 - Browse repository at this point
Copy the full SHA 67178c9View commit details -
Configuration menu - View commit details
-
Copy full SHA for c9d33e2 - Browse repository at this point
Copy the full SHA c9d33e2View commit details -
Configuration menu - View commit details
-
Copy full SHA for f6c99eb - Browse repository at this point
Copy the full SHA f6c99ebView commit details
Commits on Apr 14, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 878ef6f - Browse repository at this point
Copy the full SHA 878ef6fView commit details -
Merge pull request #70 from janvanmansum/MERGE_BACK_DEVELOP_IN_MULTI_LIC
Merged back develop
Configuration menu - View commit details
-
Copy full SHA for 5bb0142 - Browse repository at this point
Copy the full SHA 5bb0142View commit details
Commits on Apr 21, 2021
-
Merge pull request #62 from JingMa87/dd-421-wrong-location-header
DD-421 wrong location header
Configuration menu - View commit details
-
Copy full SHA for 855f8a0 - Browse repository at this point
Copy the full SHA 855f8a0View commit details -
Merge pull request #67 from JingMa87/DD-424-post-wrong-json
DD-424 post wrong json
Configuration menu - View commit details
-
Copy full SHA for 41887c5 - Browse repository at this point
Copy the full SHA 41887c5View commit details
Commits on Apr 23, 2021
-
Configuration menu - View commit details
-
Copy full SHA for d3da68b - Browse repository at this point
Copy the full SHA d3da68bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 60292bb - Browse repository at this point
Copy the full SHA 60292bbView commit details -
Merge pull request #66 from JingMa87/DD-425-missing-error-messages
DD-425 missing error messages
Configuration menu - View commit details
-
Copy full SHA for 5cee794 - Browse repository at this point
Copy the full SHA 5cee794View commit details
Commits on Apr 24, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 49f5d0a - Browse repository at this point
Copy the full SHA 49f5d0aView commit details
Commits on Apr 28, 2021
-
added license info to publish dataset popup dialog
mderuijter committedApr 28, 2021 Configuration menu - View commit details
-
Copy full SHA for 0cf7359 - Browse repository at this point
Copy the full SHA 0cf7359View commit details -
Revert "added license info to publish dataset popup dialog"
This reverts commit 0cf7359.
mderuijter committedApr 28, 2021 Configuration menu - View commit details
-
Copy full SHA for 245f04c - Browse repository at this point
Copy the full SHA 245f04cView commit details -
added license info to publish dataset dialog
mderuijter committedApr 28, 2021 Configuration menu - View commit details
-
Copy full SHA for 6219010 - Browse repository at this point
Copy the full SHA 6219010View commit details -
Merge remote-tracking branch 'blessed/multi-license' into dd-446-add-…
…license-info-to-publish-dataset-dialog
mderuijter committedApr 28, 2021 Configuration menu - View commit details
-
Copy full SHA for 5280a50 - Browse repository at this point
Copy the full SHA 5280a50View commit details -
Merge pull request #61 from JingMa87/DD-422-posting-same-license-error
DD-422 posting same license error
Configuration menu - View commit details
-
Copy full SHA for f670d73 - Browse repository at this point
Copy the full SHA f670d73View commit details -
added extra values to Bundle.properties
mderuijter committedApr 28, 2021 Configuration menu - View commit details
-
Copy full SHA for 13ec753 - Browse repository at this point
Copy the full SHA 13ec753View commit details
Commits on Apr 29, 2021
-
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
Configuration menu - View commit details
-
Copy full SHA for 0273c0f - Browse repository at this point
Copy the full SHA 0273c0fView commit details
Commits on May 26, 2021
-
* 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.
Configuration menu - View commit details
-
Copy full SHA for 83b21f0 - Browse repository at this point
Copy the full SHA 83b21f0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 71f6be2 - Browse repository at this point
Copy the full SHA 71f6be2View commit details
Commits on May 31, 2021
-
retrieve active licenses only for dropdown list
mderuijter committedMay 31, 2021 Configuration menu - View commit details
-
Copy full SHA for 55bd5a1 - Browse repository at this point
Copy the full SHA 55bd5a1View commit details
Commits on Jun 1, 2021
-
Merge pull request #78 from mderuijter/filter-inactive-licenses-from-…
…dropdown-list DD-482 Filter inactive licenses from dropdown list
Configuration menu - View commit details
-
Copy full SHA for 8f1969c - Browse repository at this point
Copy the full SHA 8f1969cView commit details -
added function to make sure custom fields are null when saving standa…
…rd license
mderuijter committedJun 1, 2021 Configuration menu - View commit details
-
Copy full SHA for ec4fd30 - Browse repository at this point
Copy the full SHA ec4fd30View commit details
Commits on Jun 3, 2021
-
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
Configuration menu - View commit details
-
Copy full SHA for 336359d - Browse repository at this point
Copy the full SHA 336359dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7dbd78d - Browse repository at this point
Copy the full SHA 7dbd78dView commit details
Commits on Jun 7, 2021
-
refreshes to propper logo&url on item select
mderuijter committedJun 7, 2021 Configuration menu - View commit details
-
Copy full SHA for e28e4e0 - Browse repository at this point
Copy the full SHA e28e4e0View commit details -
mderuijter committed
Jun 7, 2021 Configuration menu - View commit details
-
Copy full SHA for 832e4f6 - Browse repository at this point
Copy the full SHA 832e4f6View commit details
Commits on Jun 8, 2021
-
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
Configuration menu - View commit details
-
Copy full SHA for b1fb21f - Browse repository at this point
Copy the full SHA b1fb21fView commit details -
Create V5.5.0.3__7440-multi-license-add-column-to-termsofuseandaccess…
….sql
mderuijter committedJun 8, 2021 Configuration menu - View commit details
-
Copy full SHA for 74cd21b - Browse repository at this point
Copy the full SHA 74cd21bView commit details -
mderuijter committed
Jun 8, 2021 Configuration menu - View commit details
-
Copy full SHA for 9ad49e8 - Browse repository at this point
Copy the full SHA 9ad49e8View commit details
Commits on Jun 9, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 7d5c0d1 - Browse repository at this point
Copy the full SHA 7d5c0d1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7676ab5 - Browse repository at this point
Copy the full SHA 7676ab5View commit details
Commits on Jun 11, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 8915c06 - Browse repository at this point
Copy the full SHA 8915c06View commit details
Commits on Jun 12, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 17616c4 - Browse repository at this point
Copy the full SHA 17616c4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 918c86f - Browse repository at this point
Copy the full SHA 918c86fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8cc996a - Browse repository at this point
Copy the full SHA 8cc996aView commit details -
Merge pull request #85 from janvanmansum/CLEANUP_LICENSE_API
Cleanup and document license api
Configuration menu - View commit details
-
Copy full SHA for ec37254 - Browse repository at this point
Copy the full SHA ec37254View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2ecba09 - Browse repository at this point
Copy the full SHA 2ecba09View commit details
Commits on Jun 16, 2021
-
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…
Configuration menu - View commit details
-
Copy full SHA for 58b623e - Browse repository at this point
Copy the full SHA 58b623eView commit details
Commits on Jun 17, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 5b68e53 - Browse repository at this point
Copy the full SHA 5b68e53View commit details
Commits on Jun 18, 2021
-
Merge pull request #90 from janvanmansum/multi-license
DD-511 Open links to license in new tab
Configuration menu - View commit details
-
Copy full SHA for a980c5e - Browse repository at this point
Copy the full SHA a980c5eView commit details -
DD-513. Added database setting :AllowCustomTerms (#91)
Co-authored-by: Jan van Mansum <janvanmansum@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for c34bd3e - Browse repository at this point
Copy the full SHA c34bd3eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6313887 - Browse repository at this point
Copy the full SHA 6313887View commit details
Commits on Jun 19, 2021
-
Replaced redundant (and incomplete) uniqueness check with try-cath ar…
…ound database call
Configuration menu - View commit details
-
Copy full SHA for 5c72dca - Browse repository at this point
Copy the full SHA 5c72dcaView commit details -
Merge pull request #92 from janvanmansum/REFACTOR_LICENSE_UNIQUENESS
Replaced redundant (and incomplete) uniqueness check with try-cath around database call
Configuration menu - View commit details
-
Copy full SHA for 9895ddd - Browse repository at this point
Copy the full SHA 9895dddView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1b8765e - Browse repository at this point
Copy the full SHA 1b8765eView commit details -
Configuration menu - View commit details
-
Copy full SHA for d9e61a5 - Browse repository at this point
Copy the full SHA d9e61a5View commit details -
Merge pull request #93 from janvanmansum/ADD_CC0_VIA_FLYWAY
Add cc0 via flyway
Configuration menu - View commit details
-
Copy full SHA for e45b74c - Browse repository at this point
Copy the full SHA e45b74cView commit details
Commits on Jun 21, 2021
-
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>
Configuration menu - View commit details
-
Copy full SHA for 1a9fe2e - Browse repository at this point
Copy the full SHA 1a9fe2eView commit details
Commits on Jun 28, 2021
-
* WiP * Wip * Fixes Co-authored-by: Jan van Mansum <janvanmansum@users.noreply.github.com>
Configuration menu - View commit details
-
Copy full SHA for 6516186 - Browse repository at this point
Copy the full SHA 6516186View commit details
Commits on Jun 30, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 2497228 - Browse repository at this point
Copy the full SHA 2497228View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1e1e0f6 - Browse repository at this point
Copy the full SHA 1e1e0f6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6840329 - Browse repository at this point
Copy the full SHA 6840329View commit details
Commits on Jul 8, 2021
-
DD-527 Restructure license and custom terms in dataset JSON (#97)
* Update JsonPrinter.java * Restructured DatasetVersion license in JsonPrinter.java
Configuration menu - View commit details
-
Copy full SHA for fab2f99 - Browse repository at this point
Copy the full SHA fab2f99View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 20e4360 - Browse repository at this point
Copy the full SHA 20e4360View commit details
Commits on Jul 9, 2021
-
added EditMode check to setLicense
mderuijter committedJul 9, 2021 Configuration menu - View commit details
-
Copy full SHA for 0dc8e80 - Browse repository at this point
Copy the full SHA 0dc8e80View commit details
Commits on Jul 13, 2021
-
mderuijter committed
Jul 13, 2021 Configuration menu - View commit details
-
Copy full SHA for 0a187ee - Browse repository at this point
Copy the full SHA 0a187eeView commit details
Commits on Jul 14, 2021
-
Merge pull request #100 from mderuijter/dd-548-defaults-to-custom-bugfix
DD-548 added EditMode check to setLicense
Configuration menu - View commit details
-
Copy full SHA for 5b952b1 - Browse repository at this point
Copy the full SHA 5b952b1View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for d425ec7 - Browse repository at this point
Copy the full SHA d425ec7View commit details -
changed bundle property file.dataFilesTab.terms.list.termsOfUse.waive…
…r.description text
mderuijter committedJul 14, 2021 Configuration menu - View commit details
-
Copy full SHA for 4c12a7e - Browse repository at this point
Copy the full SHA 4c12a7eView commit details -
Merge pull request #104 from mderuijter/dd-533-improve-ui-text-licens…
…e-field DD-533 improve UI text license field
Configuration menu - View commit details
-
Copy full SHA for c2e7375 - Browse repository at this point
Copy the full SHA c2e7375View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for fd21968 - Browse repository at this point
Copy the full SHA fd21968View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 4518fd6 - Browse repository at this point
Copy the full SHA 4518fd6View commit details -
* 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>
Configuration menu - View commit details
-
Copy full SHA for 19f3eac - Browse repository at this point
Copy the full SHA 19f3eacView commit details
Commits on Jul 24, 2021
-
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
Configuration menu - View commit details
-
Copy full SHA for 7df29a1 - Browse repository at this point
Copy the full SHA 7df29a1View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for f8270de - Browse repository at this point
Copy the full SHA f8270deView commit details -
Configuration menu - View commit details
-
Copy full SHA for 6cc86e0 - Browse repository at this point
Copy the full SHA 6cc86e0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 352e6b4 - Browse repository at this point
Copy the full SHA 352e6b4View commit details -
Configuration menu - View commit details
-
Copy full SHA for a5e0125 - Browse repository at this point
Copy the full SHA a5e0125View commit details -
Configuration menu - View commit details
-
Copy full SHA for 046df42 - Browse repository at this point
Copy the full SHA 046df42View commit details -
Configuration menu - View commit details
-
Copy full SHA for f93e45f - Browse repository at this point
Copy the full SHA f93e45fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 56c12c4 - Browse repository at this point
Copy the full SHA 56c12c4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 924e166 - Browse repository at this point
Copy the full SHA 924e166View commit details -
Configuration menu - View commit details
-
Copy full SHA for e499435 - Browse repository at this point
Copy the full SHA e499435View commit details -
Configuration menu - View commit details
-
Copy full SHA for 417b875 - Browse repository at this point
Copy the full SHA 417b875View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0dd15b0 - Browse repository at this point
Copy the full SHA 0dd15b0View commit details
Commits on Jul 27, 2021
-
urlIcon element does not disploy if empty now
mderuijter committedJul 27, 2021 Configuration menu - View commit details
-
Copy full SHA for 46f675e - Browse repository at this point
Copy the full SHA 46f675eView commit details
Commits on Jul 28, 2021
-
added api call GET /licenses/default
mderuijter committedJul 28, 2021 Configuration menu - View commit details
-
Copy full SHA for 9223a3e - Browse repository at this point
Copy the full SHA 9223a3eView commit details
Commits on Aug 16, 2021
-
removed termsofuseandacces.license column
mderuijter committedAug 16, 2021 Configuration menu - View commit details
-
Copy full SHA for 9f58548 - Browse repository at this point
Copy the full SHA 9f58548View commit details
Commits on Sep 10, 2021
-
Merge pull request #112 from mderuijter/dd-562-implement-GET-api-admi…
…n-licenses-default DD-562 Implement GET /api/admin/licenses/default
Configuration menu - View commit details
-
Copy full SHA for 31d7470 - Browse repository at this point
Copy the full SHA 31d7470View commit details -
DD-573 Implement set license in semantic api (#113)
* implemented set license via semantic API * fixed some of the required logic
Configuration menu - View commit details
-
Copy full SHA for 925a1c3 - Browse repository at this point
Copy the full SHA 925a1c3View commit details -
Merge pull request #114 from mderuijter/dd-549-removed-termsofuseanda…
…ccess-license-column DD-549 Is field/column termsofuseandaccess.license still necessary?
Configuration menu - View commit details
-
Copy full SHA for 556be4a - Browse repository at this point
Copy the full SHA 556be4aView commit details -
Merge pull request #110 from mderuijter/dd-552-remove-reference-to-wa…
…iver DD-552 Remove references to "waiver" from code and UI
Configuration menu - View commit details
-
Copy full SHA for 051f75d - Browse repository at this point
Copy the full SHA 051f75dView commit details -
Configuration menu - View commit details
-
Copy full SHA for b001bf1 - Browse repository at this point
Copy the full SHA b001bf1View commit details -
Configuration menu - View commit details
-
Copy full SHA for 47cabe1 - Browse repository at this point
Copy the full SHA 47cabe1View commit details
Commits on Sep 15, 2021
-
DD-561 Updated SwordServiceBean to support multi-license (#118)
* Updated SwordServiceBean to support multi-license
Configuration menu - View commit details
-
Copy full SHA for 60cb2ea - Browse repository at this point
Copy the full SHA 60cb2eaView commit details -
DD-593 integration test fixes multi license (#116)
* fixing AdminIT license tests * changed hardcoded license ID to always pick the last added license
Configuration menu - View commit details
-
Copy full SHA for 06c8574 - Browse repository at this point
Copy the full SHA 06c8574View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9192f35 - Browse repository at this point
Copy the full SHA 9192f35View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6a708fc - Browse repository at this point
Copy the full SHA 6a708fcView commit details
Commits on Sep 24, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 741f255 - Browse repository at this point
Copy the full SHA 741f255View commit details
Commits on Oct 5, 2021
-
DD-529. Fixes in setting of TermsOfUseAndAccess properties in JSONLDU…
…til. Done together with @qqmyers.
Configuration menu - View commit details
-
Copy full SHA for 6ad3bc3 - Browse repository at this point
Copy the full SHA 6ad3bc3View commit details
Commits on Oct 6, 2021
-
Merge pull request #125 from janvanmansum/DD-529
DD-529 Fixes in JSONLDUtil
Configuration menu - View commit details
-
Copy full SHA for a421aba - Browse repository at this point
Copy the full SHA a421abaView commit details -
mderuijter committed
Oct 6, 2021 Configuration menu - View commit details
-
Copy full SHA for 5151b94 - Browse repository at this point
Copy the full SHA 5151b94View commit details -
Merge remote-tracking branch 'blessed/multi-license' into multi-license
mderuijter committedOct 6, 2021 Configuration menu - View commit details
-
Copy full SHA for 896c02a - Browse repository at this point
Copy the full SHA 896c02aView commit details -
mderuijter committed
Oct 6, 2021 Configuration menu - View commit details
-
Copy full SHA for fae7475 - Browse repository at this point
Copy the full SHA fae7475View commit details -
Merge remote-tracking branch 'upstream/develop' into dd-617-change-re…
…quests-multi-license-pr
mderuijter committedOct 6, 2021 Configuration menu - View commit details
-
Copy full SHA for cea9c17 - Browse repository at this point
Copy the full SHA cea9c17View commit details -
Configuration menu - View commit details
-
Copy full SHA for e21ee3b - Browse repository at this point
Copy the full SHA e21ee3bView commit details
Commits on Oct 7, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 9840eb3 - Browse repository at this point
Copy the full SHA 9840eb3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 83e8dfe - Browse repository at this point
Copy the full SHA 83e8dfeView commit details -
Merge remote-tracking branch 'blessed/multi-license' into dd-617-chan…
…ge-requests-multi-license-pr
mderuijter committedOct 7, 2021 Configuration menu - View commit details
-
Copy full SHA for 1002e87 - Browse repository at this point
Copy the full SHA 1002e87View commit details -
simplified multi-license code for OpenAIRE export
mderuijter committedOct 7, 2021 Configuration menu - View commit details
-
Copy full SHA for 7cafa70 - Browse repository at this point
Copy the full SHA 7cafa70View commit details
Commits on Oct 8, 2021
-
Merge pull request #127 from GlobalDataverseCommunityConsortium/multi…
…-license Fix flyway numbering
Configuration menu - View commit details
-
Copy full SHA for 9cb9518 - Browse repository at this point
Copy the full SHA 9cb9518View commit details -
Merge pull request #126 from mderuijter/dd-617-change-requests-multi-…
…license-pr DD-617 change requests multi license pr
Configuration menu - View commit details
-
Copy full SHA for ef2e276 - Browse repository at this point
Copy the full SHA ef2e276View commit details
Commits on Oct 22, 2021
-
Configuration menu - View commit details
-
Copy full SHA for d2c61b3 - Browse repository at this point
Copy the full SHA d2c61b3View commit details
Commits on Oct 26, 2021
-
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
Configuration menu - View commit details
-
Copy full SHA for 6159d19 - Browse repository at this point
Copy the full SHA 6159d19View commit details -
Configuration menu - View commit details
-
Copy full SHA for 91a5fab - Browse repository at this point
Copy the full SHA 91a5fabView commit details
Commits on Oct 27, 2021
-
Merge pull request #132 from GlobalDataverseCommunityConsortium/multi…
…-license update flyway numbering
Configuration menu - View commit details
-
Copy full SHA for e55b12e - Browse repository at this point
Copy the full SHA e55b12eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4cbaa01 - Browse repository at this point
Copy the full SHA 4cbaa01View commit details
Commits on Oct 28, 2021
-
Merge pull request #133 from GlobalDataverseCommunityConsortium/multi…
…-license Also need to handle new install where license column doesn't exist
Configuration menu - View commit details
-
Copy full SHA for f5ee336 - Browse repository at this point
Copy the full SHA f5ee336View commit details -
DD-647 fixed/refactored exception handling (#131)
* fixed/refactored exception handling * organized imports * Revert "organized imports" This reverts commit 87af77c. * fixed import-diffs
Configuration menu - View commit details
-
Copy full SHA for a55304c - Browse repository at this point
Copy the full SHA a55304cView commit details -
mderuijter committed
Oct 28, 2021 Configuration menu - View commit details
-
Copy full SHA for ff5fcaf - Browse repository at this point
Copy the full SHA ff5fcafView commit details -
Merge pull request #134 from mderuijter/dd-681-refactoring-code
DD-681 Refactored Multi-License Code
Configuration menu - View commit details
-
Copy full SHA for 97ff410 - Browse repository at this point
Copy the full SHA 97ff410View commit details
Commits on Nov 2, 2021
-
DD-683 UI Change Requests Multi License (#135)
* implemented changes * implemented change requests
Configuration menu - View commit details
-
Copy full SHA for 1c4ee43 - Browse repository at this point
Copy the full SHA 1c4ee43View commit details
Commits on Nov 9, 2021
-
Configuration menu - View commit details
-
Copy full SHA for f994923 - Browse repository at this point
Copy the full SHA f994923View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1d575bd - Browse repository at this point
Copy the full SHA 1d575bdView commit details
Commits on Nov 15, 2021
-
Configuration menu - View commit details
-
Copy full SHA for a79143e - Browse repository at this point
Copy the full SHA a79143eView commit details
Commits on Nov 22, 2021
-
Configuration menu - View commit details
-
Copy full SHA for b87e19a - Browse repository at this point
Copy the full SHA b87e19aView commit details -
Configuration menu - View commit details
-
Copy full SHA for c9bf631 - Browse repository at this point
Copy the full SHA c9bf631View commit details -
Configuration menu - View commit details
-
Copy full SHA for 150a393 - Browse repository at this point
Copy the full SHA 150a393View commit details
Commits on Nov 23, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 1a7def0 - Browse repository at this point
Copy the full SHA 1a7def0View commit details -
Configuration menu - View commit details
-
Copy full SHA for de506ee - Browse repository at this point
Copy the full SHA de506eeView commit details
Commits on Nov 25, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 19f9edf - Browse repository at this point
Copy the full SHA 19f9edfView commit details
Commits on Nov 29, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 73e6fc8 - Browse repository at this point
Copy the full SHA 73e6fc8View commit details
Commits on Dec 5, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 1065610 - Browse repository at this point
Copy the full SHA 1065610View commit details -
Configuration menu - View commit details
-
Copy full SHA for 727c997 - Browse repository at this point
Copy the full SHA 727c997View commit details
Commits on Dec 8, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 76a12d1 - Browse repository at this point
Copy the full SHA 76a12d1View commit details
Commits on Dec 12, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 0618c14 - Browse repository at this point
Copy the full SHA 0618c14View commit details -
Configuration menu - View commit details
-
Copy full SHA for 1f81a45 - Browse repository at this point
Copy the full SHA 1f81a45View commit details
Commits on Dec 14, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 9cf8e6d - Browse repository at this point
Copy the full SHA 9cf8e6dView commit details
Commits on Dec 15, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 5045950 - Browse repository at this point
Copy the full SHA 5045950View commit details -
Configuration menu - View commit details
-
Copy full SHA for 3d70aeb - Browse repository at this point
Copy the full SHA 3d70aebView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 525add2 - Browse repository at this point
Copy the full SHA 525add2View commit details -
Configuration menu - View commit details
-
Copy full SHA for a4eb99e - Browse repository at this point
Copy the full SHA a4eb99eView commit details -
Configuration menu - View commit details
-
Copy full SHA for af8cba7 - Browse repository at this point
Copy the full SHA af8cba7View commit details -
Configuration menu - View commit details
-
Copy full SHA for dea8f13 - Browse repository at this point
Copy the full SHA dea8f13View commit details
Commits on Dec 16, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 2be06ef - Browse repository at this point
Copy the full SHA 2be06efView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0fc0124 - Browse repository at this point
Copy the full SHA 0fc0124View commit details -
Configuration menu - View commit details
-
Copy full SHA for 59c4b25 - Browse repository at this point
Copy the full SHA 59c4b25View commit details -
switch to using License objects directly in select menu
start to making mLicense changes in Templates
Configuration menu - View commit details
-
Copy full SHA for d04cfce - Browse repository at this point
Copy the full SHA d04cfceView commit details -
Configuration menu - View commit details
-
Copy full SHA for 019dd94 - Browse repository at this point
Copy the full SHA 019dd94View commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for 2438185 - Browse repository at this point
Copy the full SHA 2438185View commit details -
Configuration menu - View commit details
-
Copy full SHA for e1be751 - Browse repository at this point
Copy the full SHA e1be751View commit details
Commits on Dec 17, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 3da511a - Browse repository at this point
Copy the full SHA 3da511aView commit details
Commits on Dec 20, 2021
-
Configuration menu - View commit details
-
Copy full SHA for 9c15773 - Browse repository at this point
Copy the full SHA 9c15773View commit details -
Configuration menu - View commit details
-
Copy full SHA for c8b4ef7 - Browse repository at this point
Copy the full SHA c8b4ef7View commit details -
Configuration menu - View commit details
-
Copy full SHA for a213ab4 - Browse repository at this point
Copy the full SHA a213ab4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 119eca8 - Browse repository at this point
Copy the full SHA 119eca8View commit details
Commits on Jan 3, 2022
-
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.
Configuration menu - View commit details
-
Copy full SHA for f838f74 - Browse repository at this point
Copy the full SHA f838f74View commit details
Commits on Jan 4, 2022
-
Merge pull request #137 from GlobalDataverseCommunityConsortium/multi…
…-license Fix error response/AdminITlicense tests
Configuration menu - View commit details
-
Copy full SHA for 5a582f3 - Browse repository at this point
Copy the full SHA 5a582f3View commit details -
Configuration menu - View commit details
-
Copy full SHA for 61e327e - Browse repository at this point
Copy the full SHA 61e327eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 0cfe058 - Browse repository at this point
Copy the full SHA 0cfe058View commit details
Commits on Jan 5, 2022
-
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" }
Configuration menu - View commit details
-
Copy full SHA for 529c5d0 - Browse repository at this point
Copy the full SHA 529c5d0View commit details -
Merge pull request #138 from GlobalDataverseCommunityConsortium/multi…
…-license remove obsolete tests
Configuration menu - View commit details
-
Copy full SHA for 1c50160 - Browse repository at this point
Copy the full SHA 1c50160View commit details -
Merge remote-tracking branch 'IQSS/develop' into DANS/multi-license
Conflicts: src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
Configuration menu - View commit details
-
Copy full SHA for 9a4fa8d - Browse repository at this point
Copy the full SHA 9a4fa8dView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for b6c2d80 - Browse repository at this point
Copy the full SHA b6c2d80View commit details -
Merge pull request #139 from GlobalDataverseCommunityConsortium/multi…
…-license Merge/fix build
Configuration menu - View commit details
-
Copy full SHA for 842f0a8 - Browse repository at this point
Copy the full SHA 842f0a8View commit details
Commits on Jan 6, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 4bbd51a - Browse repository at this point
Copy the full SHA 4bbd51aView commit details -
Configuration menu - View commit details
-
Copy full SHA for b1880cb - Browse repository at this point
Copy the full SHA b1880cbView commit details
Commits on Jan 7, 2022
-
Update doc/release-notes/7440-multilicense.md
Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for dbdc031 - Browse repository at this point
Copy the full SHA dbdc031View commit details -
Update doc/release-notes/7440-multilicense.md
Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for e83e3d7 - Browse repository at this point
Copy the full SHA e83e3d7View commit details -
Update doc/release-notes/7440-multilicense.md
Co-authored-by: Philip Durbin <philipdurbin@gmail.com>
Configuration menu - View commit details
-
Copy full SHA for 2ed5680 - Browse repository at this point
Copy the full SHA 2ed5680View commit details
Commits on Jan 10, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 3d26262 - Browse repository at this point
Copy the full SHA 3d26262View commit details -
Configuration menu - View commit details
-
Copy full SHA for c10530c - Browse repository at this point
Copy the full SHA c10530cView commit details -
Configuration menu - View commit details
-
Copy full SHA for b6d170b - Browse repository at this point
Copy the full SHA b6d170bView commit details
Commits on Jan 11, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 513c011 - Browse repository at this point
Copy the full SHA 513c011View commit details -
Configuration menu - View commit details
-
Copy full SHA for 2fac0e8 - Browse repository at this point
Copy the full SHA 2fac0e8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 02a04bd - Browse repository at this point
Copy the full SHA 02a04bdView commit details -
Configuration menu - View commit details
-
Copy full SHA for 27a607f - Browse repository at this point
Copy the full SHA 27a607fView commit details -
Configuration menu - View commit details
-
Copy full SHA for a6687a0 - Browse repository at this point
Copy the full SHA a6687a0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 663bde9 - Browse repository at this point
Copy the full SHA 663bde9View commit details -
Configuration menu - View commit details
-
Copy full SHA for a183b4a - Browse repository at this point
Copy the full SHA a183b4aView commit details -
Configuration menu - View commit details
-
Copy full SHA for 3e897e8 - Browse repository at this point
Copy the full SHA 3e897e8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 632b71d - Browse repository at this point
Copy the full SHA 632b71dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 5ef1972 - Browse repository at this point
Copy the full SHA 5ef1972View commit details -
Configuration menu - View commit details
-
Copy full SHA for dc08712 - Browse repository at this point
Copy the full SHA dc08712View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7bcfa0e - Browse repository at this point
Copy the full SHA 7bcfa0eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9131e96 - Browse repository at this point
Copy the full SHA 9131e96View commit details -
Configuration menu - View commit details
-
Copy full SHA for e8c9fc9 - Browse repository at this point
Copy the full SHA e8c9fc9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5cf2bd4 - Browse repository at this point
Copy the full SHA 5cf2bd4View commit details -
Configuration menu - View commit details
-
Copy full SHA for 8f2624b - Browse repository at this point
Copy the full SHA 8f2624bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1e2e83b - Browse repository at this point
Copy the full SHA 1e2e83bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 76a789b - Browse repository at this point
Copy the full SHA 76a789bView commit details
Commits on Jan 12, 2022
-
Merge pull request #140 from GlobalDataverseCommunityConsortium/multi…
…-license Multi license
Configuration menu - View commit details
-
Copy full SHA for 1c79279 - Browse repository at this point
Copy the full SHA 1c79279View commit details
Commits on Jan 13, 2022
-
Configuration menu - View commit details
-
Copy full SHA for aee5d76 - Browse repository at this point
Copy the full SHA aee5d76View commit details -
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
Configuration menu - View commit details
-
Copy full SHA for fb60c1f - Browse repository at this point
Copy the full SHA fb60c1fView commit details -
fix respecting custom terms property
FWIW: the rendered attribute isn't supported on selectItem elements
Configuration menu - View commit details
-
Copy full SHA for 5623537 - Browse repository at this point
Copy the full SHA 5623537View commit details
Commits on Jan 14, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 7bdf6b6 - Browse repository at this point
Copy the full SHA 7bdf6b6View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d1b8e1 - Browse repository at this point
Copy the full SHA 5d1b8e1View commit details -
Configuration menu - View commit details
-
Copy full SHA for dad5fc8 - Browse repository at this point
Copy the full SHA dad5fc8View commit details -
Configuration menu - View commit details
-
Copy full SHA for 91fba7c - Browse repository at this point
Copy the full SHA 91fba7cView commit details -
Configuration menu - View commit details
-
Copy full SHA for eeab710 - Browse repository at this point
Copy the full SHA eeab710View commit details -
Configuration menu - View commit details
-
Copy full SHA for 0b667be - Browse repository at this point
Copy the full SHA 0b667beView commit details -
Configuration menu - View commit details
-
Copy full SHA for b097628 - Browse repository at this point
Copy the full SHA b097628View commit details -
Merge remote-tracking branch 'IQSS/develop' into DANS/multi-license
Conflicts: src/main/webapp/dataset-license-terms.xhtml
Configuration menu - View commit details
-
Copy full SHA for 3d71fc9 - Browse repository at this point
Copy the full SHA 3d71fc9View commit details
Commits on Jan 15, 2022
-
Merge pull request #141 from GlobalDataverseCommunityConsortium/multi…
…-license Bug/regression fixes, add terms in download dialog
Configuration menu - View commit details
-
Copy full SHA for a85765d - Browse repository at this point
Copy the full SHA a85765dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 304371c - Browse repository at this point
Copy the full SHA 304371cView commit details
Commits on Jan 21, 2022
-
Configuration menu - View commit details
-
Copy full SHA for e4e9f0e - Browse repository at this point
Copy the full SHA e4e9f0eView commit details -
Configuration menu - View commit details
-
Copy full SHA for ec3965e - Browse repository at this point
Copy the full SHA ec3965eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4175f4b - Browse repository at this point
Copy the full SHA 4175f4bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 075d55b - Browse repository at this point
Copy the full SHA 075d55bView commit details -
Configuration menu - View commit details
-
Copy full SHA for d4ef070 - Browse repository at this point
Copy the full SHA d4ef070View commit details -
Configuration menu - View commit details
-
Copy full SHA for fb309dd - Browse repository at this point
Copy the full SHA fb309ddView commit details
Commits on Jan 24, 2022
-
Merge pull request #142 from GlobalDataverseCommunityConsortium/multi…
…-license Review changes
Configuration menu - View commit details
-
Copy full SHA for 860b08f - Browse repository at this point
Copy the full SHA 860b08fView commit details
Commits on Jan 26, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 4433533 - Browse repository at this point
Copy the full SHA 4433533View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7a176a5 - Browse repository at this point
Copy the full SHA 7a176a5View commit details -
Configuration menu - View commit details
-
Copy full SHA for 9526963 - Browse repository at this point
Copy the full SHA 9526963View commit details -
Configuration menu - View commit details
-
Copy full SHA for 4665ac7 - Browse repository at this point
Copy the full SHA 4665ac7View commit details
Commits on Jan 27, 2022
-
Merge pull request #143 from GlobalDataverseCommunityConsortium/DANS/…
…multi-license QA fixes
Configuration menu - View commit details
-
Copy full SHA for 54bf74c - Browse repository at this point
Copy the full SHA 54bf74cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7721ca9 - Browse repository at this point
Copy the full SHA 7721ca9View commit details
Commits on Jan 28, 2022
-
Configuration menu - View commit details
-
Copy full SHA for 55f7d0d - Browse repository at this point
Copy the full SHA 55f7d0dView commit details -
Configuration menu - View commit details
-
Copy full SHA for 334bb48 - Browse repository at this point
Copy the full SHA 334bb48View commit details -
Merge pull request #144 from GlobalDataverseCommunityConsortium/multi…
…-license Retry updates
Configuration menu - View commit details
-
Copy full SHA for 20b3142 - Browse repository at this point
Copy the full SHA 20b3142View commit details -
Configuration menu - View commit details
-
Copy full SHA for 667c1b0 - Browse repository at this point
Copy the full SHA 667c1b0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 148fbcd - Browse repository at this point
Copy the full SHA 148fbcdView commit details -
Configuration menu - View commit details
-
Copy full SHA for fd8946c - Browse repository at this point
Copy the full SHA fd8946cView commit details
Commits on Jan 31, 2022
-
Merge pull request #145 from GlobalDataverseCommunityConsortium/multi…
…-license ~final QA updates
Configuration menu - View commit details
-
Copy full SHA for e6d449a - Browse repository at this point
Copy the full SHA e6d449aView commit details