Skip to content

fix: Add missing CC licences and display CC code instead of URL#6784

Merged
dragonstyle merged 5 commits intoquarto-dev:mainfrom
mcanouil:fix/issue6783
Sep 11, 2023
Merged

fix: Add missing CC licences and display CC code instead of URL#6784
dragonstyle merged 5 commits intoquarto-dev:mainfrom
mcanouil:fix/issue6783

Conversation

@mcanouil
Copy link
Collaborator

@mcanouil mcanouil commented Sep 9, 2023

This PR add the missing CC licenses and also use the CC code as display test instead of the license URL.

image

Fixes #6783

@mcanouil mcanouil requested a review from dragonstyle September 9, 2023 16:14
@cderv
Copy link
Collaborator

cderv commented Sep 11, 2023

Just a note that this has been addressed in 9b817de already, hence the merge conflict.

@mcanouil
Copy link
Collaborator Author

mcanouil commented Sep 11, 2023

@dragonstyle and I are aware since we did it at the same time (although I assigned myself the issue first to let others know 😅)
Also why, he is assigned as reviewer to let him handle (close or cherry pick any useful things not already done).

@cderv
Copy link
Collaborator

cderv commented Sep 11, 2023

Ok good. Though it is hard to review a PR that has a conflict. So I wasn't sure you had seen the commit in main, and the conflict.

Wouldn't it be better to fix the PR here to remove conflict to clearly show the proposed changed ?
Probably either

  • revert 9b817de and keep all this change,
  • Or adapt 9b817de with your specific idea.

Anyhow, I let you deal with that. It is just conflict in PR usually means hard to review and even no-go for review sometimes.

@mcanouil mcanouil requested a review from cderv September 11, 2023 10:50
@mcanouil
Copy link
Collaborator Author

I fixed the conflict and updated the code to display the license instead or the URL as in my screenshot.

@dragonstyle
Copy link
Collaborator

This is a very nice improvement, sorry again for the conflict!

@dragonstyle dragonstyle merged commit 3bf3a35 into quarto-dev:main Sep 11, 2023
@mcanouil mcanouil deleted the fix/issue6783 branch September 11, 2023 12:43
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.

Add more CC licences

3 participants