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 images directory #143

Merged
merged 4 commits into from Feb 29, 2016
Merged

Add images directory #143

merged 4 commits into from Feb 29, 2016

Conversation

zkamvar
Copy link
Contributor

@zkamvar zkamvar commented Feb 12, 2016

This additionally adds figure 1 for the paper. The SVG file falls under MIT, but does the image require a CC-BY?

@zkamvar
Copy link
Contributor Author

zkamvar commented Feb 16, 2016

@hlapp, Do you have any input?

@hlapp
Copy link
Member

hlapp commented Feb 16, 2016

I was going to look at it in more detail. Re: licenses, IMHO there's no reason not to apply CC-BY to all images regardless of their format, and it looks like the SVG as it's written has the namespace (xmlns:cc="http://creativecommons.org/ns#") and means (<metadata/>) already predefined for asserting the license right within the file itself; the tool that writes it (Inkscape?) just needs to be told the appropriate value to put there.

@zkamvar
Copy link
Contributor Author

zkamvar commented Feb 22, 2016

ping

@zkamvar
Copy link
Contributor Author

zkamvar commented Feb 29, 2016

@hlapp, would you be okay merging this? IMO, it should be merged before we submit the paper so that it has precedence regarding the license.

@hlapp
Copy link
Member

hlapp commented Feb 29, 2016

Sorry I somehow missed the fact that you had added fixes and mistakenly thought that I had to tweak something here. This looks perfect. I'm going ahead to merge. Sorry for the delay, and great fix to the SVG!

hlapp added a commit that referenced this pull request Feb 29, 2016
@hlapp hlapp merged commit 6f60716 into master Feb 29, 2016
hlapp added a commit that referenced this pull request Feb 29, 2016
More precisely, fix the deploy step timeout. The build actually succeeds,
which presumably is why there wasn't any issue with the test on PR #143.
The build with failed deploy step is here:
https://circleci.com/gh/NESCent/popgenInfo/428
@zkamvar
Copy link
Contributor Author

zkamvar commented Feb 29, 2016

Sorry for the delay

No worries, it makes me feel like I've accomplished something! 😹

@hlapp hlapp deleted the add-images branch March 15, 2016 13:11
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.

None yet

2 participants