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

added awareness of doxing and blackmaling #69

Closed
wants to merge 1 commit into from

Conversation

eylles
Copy link

@eylles eylles commented Mar 31, 2021

Overview

  1. for a true ethical software the modern concerns of doxxing, targeted harassment, threatening and blackmailing should be taken on account.

  2. the current state of the license only recognizes organizations, websites, products and services but leaves out individuals.

Proposed Resolution

  1. adding awareness of the issues of doxing, blackmailing, targeted harassment and threatening to the license.

  2. adding awareness about individuals.

@aeriksen
Copy link

aeriksen commented Mar 31, 2021 via email

@eylles
Copy link
Author

eylles commented May 11, 2021

@aeriksen the nuclear power clause is part of the original license, i didn't add that, but i would like to suggest it's removal in a future PR, i being an electronics engineering student myself i think that nuclear power is the way to go in the areas where geothermal power ain't viable, prefferably with thorium reactors.

@eylles
Copy link
Author

eylles commented Jan 6, 2022

@chrisjensen

@ghost
Copy link

ghost commented Aug 5, 2022

@aeriksen the nuclear power clause is part of the original license, i didn't add that, but i would like to suggest it's removal in a future PR, i being an electronics engineering student myself i think that nuclear power is the way to go in the areas where geothermal power ain't viable, prefferably with thorium reactors.

@eylles is correct. I just checked the commit, and the diffs do not show any additions about nuclear energy. @tommaitland, what do you think of this PR? If you like it sir, then I can incorporate it into #79.

@ghost
Copy link

ghost commented Aug 5, 2022

@eylles you may want to pull from upstream to resolve the merge conflicts :) Section 5 had a lot of changes since the last commit on this PR.

Edit 16 September, 2022

You may want to clarify a few things: Everything is good

@ghost ghost mentioned this pull request Aug 14, 2022
@eylles
Copy link
Author

eylles commented Sep 28, 2022

sorry, i've been busy with some projects, is there something needed in order to proceed here?

@ghost
Copy link

ghost commented Sep 28, 2022

(edited for grammar errors)
@eylles, let me look at your commits and compare them to PR #76 because I think that PR may be on its way to getting merged with changes that are similar to yours. Also, you're going to have a (possibly) worse merge conflict because your fork is 30 commits behind raisely:publish, so I would not recommend making any changes yet until I come back with more info. :)

@ghost
Copy link

ghost commented Sep 28, 2022

@eylles, I am sorry to say that you are going to have very, very ugly merge conflicts; the LICENSE.md file has changed drastically since you forked the repository. If I were you, I would pull upstream from raisely:publish to eylles:publish, and then try to merge to eylles:no-dox-harass-blackmail from there; If these changes from eylles:publish to eylles:no-dox-harass-blackmail are too ugly to resolve, you may to need to start from a clean slate, wait for #76 to merge (or close), pull from upstream, and re-create a new PR. I wish I could fork from your fork and help you out, but I already have a fork from @raisely.

@tommaitland
Copy link
Contributor

I believe doxing and blackmailing are adequately covered by Article 12 of the UDHR or covered by criminal codes and we don't need these called out specifically in the license.

I'm going to close the PR because @IRod22 likes things tidy (😉) but happy to discuss in an issue first if anyone feels this is the wrong approach.

@ghost
Copy link

ghost commented Sep 28, 2022

@eylles, I would still pull from upstream that way you can contribute in the future.

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.

3 participants