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

add CC BY, improve license config docs #8347 #8423

Merged
merged 2 commits into from
Feb 24, 2022
Merged

add CC BY, improve license config docs #8347 #8423

merged 2 commits into from
Feb 24, 2022

Conversation

pdurbin
Copy link
Member

@pdurbin pdurbin commented Feb 14, 2022

What this PR does / why we need it:

Pull request #7920 added multiple license support but we could take it a bit farther by providing new installations additional licenses beyond CC0 and by providing more documentation on how to manage licenses and add popular licenses such as the ones from Creative Commons.

To this end:

  • CC BY is now available for new installations.
  • New "Configuring Licenses" section added to Installation Guide.
    • JSON files for all Creative Commons licenses are downloadable.
  • URL fixed in licenseCC-BY-NC-ND-4.0.json.
  • Various cleanup of typos, formatting, etc.

Which issue(s) this PR closes:

Closes #8347

Special notes for your reviewer:

I tried to take a relatively light touch on existing docs. I used the new "Configuring Licenses" section as a way to weave them together. However, I was tempted to change the following:

  • Move the docs on /api/licenses from "Admin" to their own section ("Licenses"). They really aren't part of the Admin API. Let me know and I'll include this change.

Also, I used "CC0 1.0" instead of "CC0" in anticipation of pull request #8413 being merged.

Suggestions on how to test this:

Check to make sure of the following:

  • CC BY is now available for new installations.
  • URL fixed in licenseCC-BY-NC-ND-4.0.json.
  • Docs look and make sense.

Does this PR introduce a user interface change? If mockups are available, please link/include them here:

No.

Is there a release notes update needed for this change?:

No. I think we have enough release notes docs for multiple licenses. We can tweak them as needed at release time. The CC BY addition is only for new installations, not upgrades.

Additional documentation:

None.

- CC BY is now available for new installations.
- New "Configuring Licenses" section added to Installation Guide.
  - JSON files for all Creative Commons licenses are downloadable.
- URL fixed in licenseCC-BY-NC-ND-4.0.json.
- Various cleanup of typos, formatting, etc.
Copy link
Member

@qqmyers qqmyers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good!

@landreev landreev removed their assignment Feb 23, 2022
@kcondon kcondon self-assigned this Feb 23, 2022
@kcondon
Copy link
Contributor

kcondon commented Feb 23, 2022

@pdurbin When I run a clean install I'm seeing some bundle/labeling issues related to licenses on the dataset page and on the edit terms/license page:

Screen Shot 2022-02-23 at 4 08 34 PM

Screen Shot 2022-02-23 at 4 08 45 PM

Turns out this was user error -I had neglected to restore the clean install env. Once I did that it was fine, thanks @qqmyers

@kcondon kcondon merged commit f32ce08 into develop Feb 24, 2022
@kcondon kcondon deleted the 8347-cc branch February 24, 2022 15:17
@pdurbin pdurbin added this to the 5.10 milestone Mar 2, 2022
@pdurbin pdurbin mentioned this pull request Jun 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Install some/all Creative Commons licenses by default in new installations
4 participants