search

brackets-archive / bracketsIssues

Archive of issues in brackets.
0 stars 0 forks source link

[CLOSED] Changed license to be MIT #1653

Open core-ai-bot opened 2 years ago

core-ai-bot commented 2 years ago

Issue by davejohnson Thursday Sep 20, 2012 at 16:56 GMT Originally opened as https://github.com/adobe/brackets/pull/1696

Removed wording from the license file so that it is indeed the MIT license as stated in the about section at http://brackets.io/

davejohnson included the following code: https://github.com/adobe/brackets/pull/1696/commits

core-ai-bot commented 2 years ago

Comment by pthiess Thursday Sep 20, 2012 at 17:16 GMT

Hi Dave,

We will need a NOTICE file for the notice you removed. Please add this to your pull request.

Thanks, Peter

core-ai-bot commented 2 years ago

Comment by davejohnson Thursday Sep 20, 2012 at 19:52 GMT

Ok thanks Peter.

On Thursday, September 20, 2012, Peter Thiess wrote:

Hi Dave,

We will need a NOTICE file for the notice you removed. Please add this to your pull request.

Thanks, Peter

— Reply to this email directly or view it on GitHubhttps://github.com/adobe/brackets/pull/1696#issuecomment-8737870.

core-ai-bot commented 2 years ago

Comment by davejohnson Thursday Sep 20, 2012 at 22:34 GMT

Added the NOTICE with all third party libs and their licenses

core-ai-bot commented 2 years ago

Comment by davejohnson Thursday Sep 20, 2012 at 22:34 GMT

Oh and also added an awesome empty merge commit :)

core-ai-bot commented 2 years ago

Comment by njx Thursday Sep 20, 2012 at 22:59 GMT

Oh and also added an awesome empty merge commit :)

Good, you're following our existing style :)

(We'll get better about rebasing and keeping a clean commit history one of these days...)

core-ai-bot commented 2 years ago

Comment by adrocknaphobia Friday Oct 26, 2012 at 03:39 GMT

What is with@GarthDB's commits? Did he try to convert the MIT license to SVG?

core-ai-bot commented 2 years ago

Comment by GarthDB Friday Oct 26, 2012 at 03:48 GMT

Probably

On Thursday, October 25, 2012, Adam Lehman wrote:

What is with@GarthDB https://github.com/GarthDB's commits? Did he try to convert the MIT license to SVG?

— Reply to this email directly or view it on GitHubhttps://github.com/adobe/brackets/pull/1696#issuecomment-9802104.

core-ai-bot commented 2 years ago

Comment by adrocknaphobia Friday Oct 26, 2012 at 17:53 GMT

Well.... i don't think I should merge this with the random commits from@GarthDB and@gruehle. How can I know those commits out of the pull request?

core-ai-bot commented 2 years ago

Comment by GarthDB Friday Oct 26, 2012 at 18:22 GMT

how did all those random commits get in there? They don't seem to correspond

core-ai-bot commented 2 years ago

Comment by njx Friday Oct 26, 2012 at 18:30 GMT

Not sure, but it might be worth just trying to merge the branch with master manually (in a local repo), and then looking at the diffs to see if there are any diffs besides the license stuff. If so, then it's probably okay (though there might be some redundant commits).

If we want to really be clean, we could just cherry-pick Dave's commits.

core-ai-bot commented 2 years ago

Comment by gruehle Friday Oct 26, 2012 at 18:34 GMT

I did a local test merge and everything is clean.

These are the commands I ran:

# From an up-to-date master branch
git checkout -b davejohnson/license
git pull https://github.com/davejohnson/brackets.git license
git diff master