Mike Linksvayer
14896c3fc8
style feedback from @benbalter
2016-02-08 14:02:07 -08:00
Ben Balter
91b6c8728e
add rubocop
2016-02-08 15:37:19 -05:00
Mike Linksvayer
ade0beec17
Test that only open licenses are included per
...
https://github.com/github/choosealicense.com/blob/gh-pages/CONTRIBUTING.md#adding-a-license
- check that all licenses have minimum permissions
- remove non-open (and unused) forbiddens
- closes #1 with confidence
2016-02-08 10:25:06 -08:00
Mike Linksvayer
659c2a0d47
Merge pull request #344 from github/copyleft-tweaks
...
Copyleft tweaks
2016-02-07 11:19:19 -08:00
Mike Linksvayer
2a01884f6f
make same-license requirement, add to all copyleft licenses
2016-02-05 10:25:19 -08:00
Mike Linksvayer
5fb1cde719
remove note about LGPL and OSL, see discussion in #343
2016-02-05 09:15:05 -08:00
Mike Linksvayer
b07babb5fc
Merge pull request #343 from wking/library-use-permitted
...
Remove 'library-usage'
2016-02-04 12:25:15 -08:00
W. Trevor King
92b2fa9728
Remove 'library-usage'
...
The last meaningful change to this tag was c4c48d49 (Change nonstatic
to library usage, 2013-07-10), but I'm not sure where that discussion
happened. In any case, that commit changed some "must" wording to
"may" wording, which seems like it should move the label from required
to permitted. However, a library-usage permission would also apply to
many other licenses (e.g. folks are free to link MIT-licensed work
from a proprietary program), and adding library-usage to almost all
the licenses seems like the wrong way to make this distinction [1].
The limitations that the LGPL and OSL place on disclose-source scoping
are already covered in the disclose-source description, so the
library-usage label doesn't seem to be adding anything meaningful.
The OSL gets at this distinction by tightly scoping derivative works
[2], and the LGPL talks about combined works as a special subset of
derivative works [3,4]. The MPL makes a similar distinction between
"Covered Software" and "Larger Work" [5], and the EPL makes a similar
distinction between "derivative works" and "the Program" [6]. Whether
the location of those distinctions, or the requirements placed on
combined works can be neatly summarized in a boolean label remains to
be seen, but we're pretty sure that library-usage is not that label
[7].
Subsequent commits may replace the caveat in the disclose-source
description with wording in the license description themselves or by
adding a new label that summarizes the issue. Until then, the
disclose-source description more clearly covers the information that
library-usage was intended to convey, so this commit removes the
less-clear label to avoid redundancy.
[1]: https://github.com/github/choosealicense.com/pull/343#issuecomment-179532710
[2]: http://rosenlaw.com/OSL3.0-explained.htm#_Toc187293087
[3]: https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html
[4]: https://www.gnu.org/licenses/lgpl.html
[5]: https://www.mozilla.org/en-US/MPL/2.0/
[6]: http://www.eclipse.org/legal/epl-v10.html
[7]: https://github.com/github/choosealicense.com/pull/343#issuecomment-179557468
2016-02-04 11:38:05 -08:00
Mike Linksvayer
c58e248d9d
Merge pull request #342 from github/jekyll3-tests-cleanup
...
Fix #341 tests that broke post Jekyll 3 upgrade
2016-02-03 10:08:16 -08:00
Mike Linksvayer
09a17298ab
Fix #341 tests that broke post Jekyll 3 upgrade
...
- explicitly include jekyll-coffeescript needed per
http://jekyllrb.com/docs/upgrading/2-to-3/
- option to html-proofer to ignore script embeds; uncertain why
warnings appeared post upgrade as it doesn't seem that either
jekyll-seo-tag or html-proofer got new versions in
https://github.com/github/choosealicense.com/pull/339/files but
suppressed now in any case.
2016-02-03 09:24:05 -08:00
Mike Linksvayer
a058281e66
Merge pull request #340 from github/revert-338-revert-337-update-fields-descriptions
...
Revert "Revert "Update descriptions of fields to reflect hidden default change""
2016-02-02 16:11:26 -08:00
Mike Linksvayer
5c020b61eb
Revert "Revert "Update descriptions of fields to reflect hidden default change""
2016-02-02 16:10:39 -08:00
Mike Linksvayer
ad63cb8c1b
Merge pull request #339 from github/jekyll-3
...
upgrade to jekyll 3 due to pages upgrade
2016-02-02 16:07:16 -08:00
Mike Linksvayer
48c6e3e887
upgrade to jekyll 3 due to
...
https://github.com/blog/2100-github-pages-now-faster-and-simpler-with-jekyll-3-0
2016-02-02 16:02:01 -08:00
Mike Linksvayer
08cf5180ce
Merge pull request #338 from github/revert-337-update-fields-descriptions
...
Revert "Update descriptions of fields to reflect hidden default change"
2016-02-02 14:47:51 -08:00
Mike Linksvayer
8c8698f1f5
Revert "Update descriptions of fields to reflect hidden default change"
2016-02-02 14:45:56 -08:00
Mike Linksvayer
74c47615e8
Merge pull request #337 from github/update-fields-descriptions
...
Update descriptions of fields to reflect hidden default change
2016-02-02 14:31:58 -08:00
Mike Linksvayer
86645a03b3
Update descriptions of fields to reflect hidden default change,
...
info provided in
https://github.com/github/choosealicense.com/issues/290#issuecomment-138722623
2016-02-02 13:45:39 -08:00
Brandon Keepers
64c286edd2
Merge pull request #336 from github/new-examples
...
Update example projects
2016-02-01 19:52:04 +01:00
Brandon Keepers
6da34f0825
Use Android instead of Docker
...
Reasoning: it is a mass consumer brand that is likely to be better known than Apache
2016-02-01 19:48:02 +01:00
Brandon Keepers
3227e22d89
Revert changes to GPL text
...
This should be iterated on in another PR
2016-02-01 19:45:01 +01:00
Mike Linksvayer
17fa055cf6
Merge pull request #334 from github/gplv3-no-sublicense
...
Remove confusing and inaccurate [no-]sublicensing property
2016-02-01 09:45:34 -08:00
Mike Linksvayer
440b44b5f4
remove all attempt to describe sublicensing permission/prohibitions
2016-01-31 14:56:40 -08:00
Mike Linksvayer
53cf00a11f
Merge pull request #333 from github/artistic2-copyright
...
Artistic License 2.0 (c) is for license text, not a template
2016-01-31 13:00:10 -08:00
Brandon Keepers
abe74941dc
Update examples
...
- add a 3rd example (.NET Core) for MIT
- replace SVN & NuGet with more more modern and well-known examples
(Swift, Docker) for Apache:
- Add a GPLv3 project to examples.
2016-01-31 19:54:59 +01:00
Brandon Keepers
ba251b175a
Revert "Update examples"
...
This reverts commit 49cf1471f7a8a1aa524f8f21f0a1e0f4a20af441.
2016-01-31 19:54:01 +01:00
Brandon Keepers
49cf1471f7
Update examples
...
- add a 3rd example (.NET Core) for MIT
- replace SVN & NuGet with more more modern and well-known examples
(Swift, Docker) for Apache:
- Add a GPLv3 project to examples.
2016-01-31 19:53:09 +01:00
Mike Linksvayer
8522819681
GPLv3 doesn't allow sublicensing, just as AGPLv3 and GPLv2 don't
...
LGPLv3 doesn't allow sublicensing, justg as LGPLv2 doesn't as
former is additional permissions for GPLv3 and these don't include
sublicensing
2016-01-30 10:16:23 -08:00
Mike Linksvayer
8ed37bc56a
Artistic License 2.0 (c) is for license text, not a template
...
fix #310 introduced in 0161a3d75d5f72fe842886b79c07db6ceb773ae2
2016-01-30 10:06:05 -08:00
Mike Linksvayer
9dbc5190de
Merge pull request #332 from pra85/patch-1
...
Typo fix in CONTRIBUTING.md
2016-01-30 09:46:33 -08:00
Prayag Verma
3f6cdaa625
Typo fix in CONTRIBUTING.md
2016-01-30 10:13:53 +05:30
Mike Linksvayer
cee7569a91
Merge pull request #330 from github/bom-test
...
Test each license file does not begin with byte order mark
2016-01-29 09:56:45 -08:00
Ben Balter
41a9f1a9d7
use regex to check for BOM
2016-01-29 12:44:28 -05:00
Ben Balter
b9cdd8cb08
Merge branch 'gh-pages' into bom-test
2016-01-29 12:27:18 -05:00
Mike Linksvayer
d1d7f30b77
Merge pull request #329 from github/no-license-cleanup
...
skipping no-license no longer pertinent as no-license is no-more
2016-01-28 17:33:38 -08:00
Mike Linksvayer
6854e8aa86
Test each license file does not begin with byte order mark
...
Fixes #328
2016-01-28 17:19:42 -08:00
Mike Linksvayer
0fdcb2ca24
skipping no-license no longer pertinent as no-license is no-more
2016-01-28 15:11:42 -08:00
Mike Linksvayer
45c02a892c
Merge pull request #325 from github/spdx-name-hint
...
Make it clear in the CONTRIBUTING instructions that the license file name should be the SPDX ID
2016-01-28 14:15:12 -08:00
Mike Linksvayer
72cd65abea
Merge pull request #326 from github/no-license
...
consolidate no license info in /no-license, remove from /licenses
2016-01-28 14:01:51 -08:00
Mike Linksvayer
65b74c5612
Merge pull request #319 from sieversMartin/gh-pages
...
Added license lppl-1-3c.txt
2016-01-28 13:07:19 -08:00
sieversMartin
53324d96cd
Merge branch 'gh-pages' into gh-pages
2016-01-28 21:56:33 +01:00
Mike Linksvayer
f99821523d
Merge pull request #327 from github/eupl-render
...
remove BOM from eupl-1.1.txt which caused it to not render
2016-01-28 12:14:07 -08:00
Mike Linksvayer
96fc8b143e
tell html-proofer to check http://choosealicense.com links locally
...
rather than externally
2016-01-28 11:58:58 -08:00
Mike Linksvayer
7959b9aca4
remove BOM from eupl-1.1.txt which caused it to not render
2016-01-28 09:23:53 -08:00
Mike Linksvayer
2e261d4530
Merge pull request #320 from EmidioStani/gh-pages
...
added eupl-1.1.txt licence
2016-01-28 09:07:52 -08:00
emidiostani
aa28e590b6
Merge branch 'gh-pages' of https://github.com/EmidioStani/choosealicense.com into gh-pages
2016-01-28 09:11:30 +01:00
emidiostani
c27b9cd238
fixed comment https://github.com/github/choosealicense.com/pull/320
2016-01-28 09:10:03 +01:00
Mike Linksvayer
72f852f4eb
slim down no license copyright holder info, add section for users
2016-01-27 11:44:30 -08:00
Emidio
ec929eb17d
Merge branch 'gh-pages' into gh-pages
2016-01-27 09:55:26 +01:00
emidiostani
354ff80904
fixed errors described in https://github.com/github/choosealicense.com/pull/320
2016-01-27 09:53:04 +01:00