1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-01 16:13:02 +02:00
Commit Graph

925 Commits

Author SHA1 Message Date
Mike Linksvayer
ca3a574513 Merge branch 'gh-pages' into adius-patch-1 2016-03-16 11:56:27 -07:00
Mike Linksvayer
dae57f6edd Merge pull request #372 from github/using-LICENSE
cut down on and make using: links direct to licenses
2016-03-16 11:29:52 -07:00
Mike Linksvayer
7c4ebdbb7c Merge remote-tracking branch 'origin/gh-pages' into using-LICENSE 2016-03-16 11:27:14 -07:00
Mike Linksvayer
c6371237f3 Merge pull request #369 from github/unmyth
Unmyth
2016-03-16 11:22:42 -07:00
Mike Linksvayer
4e1109c92b consistent self-id of bsd-2/3, mit following isc in #371 2016-03-15 14:51:19 -07:00
Mike Linksvayer
9bdf2b2d36 cut down on and make using: links direct to licenses
following pattern from #358
2016-03-15 14:25:16 -07:00
Adrian Sieber
0bd80e1bff Add name of license to ISC license text 2016-03-15 19:13:39 +01:00
Mike Linksvayer
1178f03498 curated
as suggested in line comment by @benbalter
2016-03-14 11:58:17 -07:00
Mike Linksvayer
7a68ceb7cf opportunistic https to kick CI 2016-03-14 01:01:05 -07:00
Mike Linksvayer
7bce113189 Demystified -> made
Claiming open source licenses need to be demystified is a claim
that they are mysterious. Choosealicense.com is not *Capital*; its
topic does not need to be mystified and demystified at once.

http://robertpaulwolff.blogspot.com/2014/09/more-on-language-and-social-reality.html

Someone encountering open source licenses for the first time at
choosealicense.com should have zero reason to think open source
licensing is mysterious.
2016-03-14 00:26:16 -07:00
Mike Linksvayer
37f065425b always usually evaluates to false
Remove "If you have questions or issues, it is always best to consult
a legal professional."

It's not always best, especially considering it's costly and for
most finding one knowledgable about open source licensing will be
difficult.

If it were always best, the site should consist of

<h1>Consult a legal professional.</h1>

But seriously, claiming one should consult a legal professional is
no way to make choosing an open source license non-scary.
2016-03-14 00:19:53 -07:00
Mike Linksvayer
001d3dea74 Choose an open source license
"[D]oesn't have to be scary" is hardly non-judgmental nor inviting
for anyone whose first encounter with open source licensing is this
site. I've also never heard anyone other than this site claim that
choosing an open source license can be scary. Confusing or extremely
boring, yes. Choosing to go open source, yes that can be scary.
Choosing among open source licenses, no.
2016-03-14 00:04:32 -07:00
Mike Linksvayer
af65acbc98 Merge pull request #368 from github/markdownify
markdownify filter on fields for which markdown is OK
2016-03-12 11:19:47 -08:00
Mike Linksvayer
b4979b3dd4 remove <p> and </p> added by markdownify 2016-03-10 20:09:35 -08:00
Mike Linksvayer
e0299c5521 markdownify filter on fields for which markdown is OK
as suggested by @benbalter in / fixes #367

also use markdown to make EUPL boilerplate linked
2016-03-10 09:36:33 -08:00
Mike Linksvayer
702793f337 Merge branch 'gh-pages' of github.com:github/choosealicense.com into gh-pages 2016-03-09 20:26:52 -08:00
Mike Linksvayer
a4f990fe54 don't use markdown in note: field 2016-03-09 20:24:25 -08:00
Mike Linksvayer
86955aa184 Merge pull request #365 from github/pd-deduplication
drop "dedication" from family name, fix #289; drop double empty condition properties
2016-03-09 20:21:33 -08:00
Mike Linksvayer
068fe71365 Merge branch 'gh-pages' into pd-deduplication 2016-03-09 20:19:08 -08:00
Mike Linksvayer
01bfc58000 Merge pull request #366 from mmckinst/cc0
add note to CC0 about boilerplate
2016-03-09 20:15:09 -08:00
Mark McKinstry
4d147ca4df add note to CC0 about boilerplate
https://blog.creativecommons.org/2011/04/15/using-cc0-for-public-domain-software/
2016-03-09 22:39:01 -05:00
Mike Linksvayer
288824d716 Merge pull request #352 from github/CoC
Add Code of Conduct
2016-03-08 08:53:46 -08:00
Mike Linksvayer
e6ed3ecb2f Merge branch 'gh-pages' into CoC 2016-03-07 17:18:47 -08:00
Mike Linksvayer
0b83d3d44e drop "dedication" from family name, fix #289; drop double empty condition properties 2016-03-07 15:43:39 -08:00
Mike Linksvayer
4cba3a5d82 Merge branch 'waldyrious-patch-1' into gh-pages 2016-03-06 21:34:37 -08:00
Mike Linksvayer
e51c80c1ab Merge branch 'patch-1' of https://github.com/waldyrious/choosealicense.com into waldyrious-patch-1 2016-03-06 21:34:22 -08:00
Mike Linksvayer
a8e1258a6c Merge pull request #363 from wking/cc-not-software-fragment-typo
non-software: Remove period from "not CC for software" fragment
2016-03-06 21:31:03 -08:00
Waldir Pimenta
adc9883240 harmonize capitalization of labels (title case) 2016-03-06 23:13:18 +00:00
W. Trevor King
8f161c8e52 non-software: Remove period from "not CC for software" fragment
The trailing period has been there since the link landed in 2d4c4a63
(non-software licenses page, 2016-02-26, #359).
2016-03-06 13:52:42 -08:00
Mike Linksvayer
a00903196b Merge pull request #362 from github/gplv3-home
rm gplv2 from homepage
2016-03-06 09:33:05 -08:00
Mike Linksvayer
1e7e054a26 Merge remote-tracking branch 'origin/gh-pages' into gplv3-home 2016-03-05 10:08:16 -08:00
Mike Linksvayer
25f09e4a6d Merge pull request #361 from github/p-c-l
rename/order license properties better reflect how licenses work
2016-03-05 09:56:48 -08:00
Mike Linksvayer
9a56c327d7 opportunistic https to kick CI 2016-03-02 18:27:44 -08:00
Mike Linksvayer
ab3ee0061b take projects listed on homepage from license using property 2016-03-02 18:23:31 -08:00
Mike Linksvayer
9ec2de1a50 rm gplv2 from homepage
- remove descrption of v2 v3 difference
- add to description v3 express patent grant
- update example projects to only include v3 ones
- move v2 projects to gplv2 license using property

partially addresses feedback in #335
2016-03-02 10:19:33 -08:00
Mike Linksvayer
aca74d3aa3 another https opportunistic to kick CI
https://travis-ci.org/github/choosealicense.com/builds/112981705
2016-03-01 14:43:23 -08:00
Mike Linksvayer
e500227ce0 change some links to https
CI failed on a bunch of links, spurious, this just opportunisitc
to also kick CI
2016-03-01 14:14:11 -08:00
Mike Linksvayer
810eeb5618 rename/order license properties better reflect how licenses work
and are structured

grant (permissions)
conditioned on (conditions)
with limitations

Permissions coming first combats mistaken but apparently widespread
impression that licenses impose conditions, even such that without
a license, there would be no conditions/work would be in the public
domain.

Requirements->Conditions emphasizes that they are pertinent if one
wants to take advantage of permissions.

Forbiddens->Limitations is more accurate: in most cases licenses
don't give permission to hold licensors liable, in some cases to
use licensors' trademarks or patents, but a licensee does not lose
the permissions granted by the license if the licensee holds licensor
liable, etc. Also emphasizes that there are limitatations on the
license grant, not that the license imposes prohibitions.

The most concise place to see both the rename and reorder is in
_includes/license-overview.html

I did not reorder the appearance of the groups of properties in
license source files (.txt files in _licenses) as those orderings
are not used to render anything on the webiste. Might do so later.
2016-03-01 13:33:15 -08:00
Mike Linksvayer
7b2790bf14 Merge pull request #360 from github/express-non-patent-grant
Express non patent grant
2016-02-29 20:44:38 -08:00
Mike Linksvayer
78217a096b Use Trademark -> Trademark Use to match otther Use Xs 2016-02-28 12:15:51 -08:00
Mike Linksvayer
2c063f2a94 sync README.md with _data/rules.yml, remove non-open forbiddens
should have been removed as part of
https://github.com/github/choosealicense.com/pull/345
correct that oversight
2016-02-28 12:12:57 -08:00
Mike Linksvayer
ede7a09118 Add "forbidden" property for "patent-use", mirroring "trademark-use",
for the sorry licenses that explicitly do not grant any patent
permissions
2016-02-28 12:10:23 -08:00
Mike Linksvayer
29538e1dcf Merge pull request #359 from github/food-licenses
non-software licenses page
2016-02-28 08:43:09 -08:00
Mike Linksvayer
7acfa511b1 Merge pull request #358 from thewarpaint/add-project-links
Add project links
2016-02-27 11:10:09 -08:00
Eduardo Garcia
779e19fb3b Add project links 2016-02-26 16:52:25 -06:00
Mike Linksvayer
c46511d314 Attempt to address line comments from @benbalter 2016-02-26 14:44:57 -08:00
Mike Linksvayer
2d4c4a63bd non-software licenses page
building on https://github.com/github/choosealicense.com/pull/307

non-software rather than non-code because software is eating the
world, the main topic is open source software, and I find
software/non-software slighly less trying than code/non-code if
only because it isn't a
[thing](http://www.adamhyde.net/perhaps-stop-using-non-code-whatayarekin/).

tweak text of page, also addressing #261 and #313
2016-02-26 12:34:20 -08:00
Mike Linksvayer
6df14f2d42 Merge branch 'content-B' of https://github.com/afeld/choosealicense.com into food-licenses 2016-02-25 18:18:41 -08:00
Mike Linksvayer
ffc84c2b41 Merge pull request #357 from wking/cc-fixups
cc-by-sa-4.0: Fix CC BY link and add compatible license mention
2016-02-24 14:33:14 -08:00
W. Trevor King
39154843df cc-by-sa-4.0: Weaken "same license" to mention compatibility
The human-readable summary uses "same license" [1], but also links to
a page listing other compatible licenses [2], and the license text
includes a compatible-license alternative [3,4].  This commit links to
that same set of compatible licenses using Mike's wording [5].

[1]: https://creativecommons.org/licenses/by-sa/4.0/
[2]: https://creativecommons.org/compatiblelicenses/
[3]: https://creativecommons.org/licenses/by-sa/4.0/legalcode#s3b1
[4]: https://creativecommons.org/licenses/by-sa/4.0/legalcode#s1c
[5]: https://github.com/github/choosealicense.com/pull/353/files#r53963602
2016-02-24 14:18:35 -08:00