1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

147 Commits

Author SHA1 Message Date
Emil Gedda
bed6d31cc7 Correct the spelling of "license" in wtfpl
Just a minor correction i found while browsing.
2016-06-15 21:44:52 +02:00
Mike Linksvayer
cf79b35e06 re-add optional hidden field, default to true
licenses on /licenses have `hidden: false` set

fixes #434
2016-06-14 10:35:44 -07:00
Mike Linksvayer
7cefe4c92d rm unncessary 'additionally' 2016-06-03 10:25:30 -07:00
Mike Linksvayer
6d8339765e remove somewhat redundant words 2016-06-03 10:10:08 -07:00
Mike Linksvayer
d6f7e196ca Merge branch 'gh-pages' into functional-descriptions 2016-06-01 09:01:10 -07:00
Mike Linksvayer
28e4765dfe spdx-id required, nickname only for licenses with customary short names 2016-05-24 16:21:13 -05:00
Mike Linksvayer
6fe44f4637 Make nickname a required meta field
Add missing nicknames
Use SPDX ID if no customary nickname (eg GNU GPLv3) exists

This ensures that a relatively compact name is always available

I may be missing some obvious customary names, e.g., is "Eclipse
1.0" customary? For now I've used the SPDX ID, EPL-1.0.
2016-05-24 14:21:29 -05:00
Philippe Loctaux
4c4f200344 Update bsd-3-clause.txt 2016-05-23 23:28:53 +02:00
Philippe Loctaux
4636330a4c Update bsd-3-clause-clear.txt 2016-05-23 23:28:32 +02:00
Philippe Loctaux
edbb88820a Update bsd-3-clause-clear.txt
fixed spelling
2016-05-23 08:27:44 +02:00
Philippe Loctaux
f58d55c699 Update bsd-3-clause.txt
fixed spelling
2016-05-23 08:27:24 +02:00
Philippe Loctaux
a84497089b Update bsd-3-clause.txt 2016-05-20 00:36:36 +02:00
Philippe Loctaux
88eab45508 Update bsd-3-clause-clear.txt 2016-05-20 00:36:21 +02:00
Mike Linksvayer
76970d1170 Merge branch 'gh-pages' into functional-descriptions 2016-05-03 14:44:18 -07:00
Théo Zimmermann
1f667089c7 Highlight projects with simpler licensing practices 2016-05-03 22:53:25 +02:00
Théo Zimmermann
a84fc73166 Update the link to LibreOffice license file 2016-05-03 17:52:42 +02:00
Théo Zimmermann
f915264bc8 Add examples of software under MPL
No better links found for Mozilla Firefox and Thunderbird.
2016-05-03 12:27:55 +02:00
Théo Zimmermann
7eeef34696 Add a note on the recommended boilerplate
See the recommendation of the Mozilla Foundation here: https://www.mozilla.org/en-US/MPL/2.0/FAQ/#license-use
2016-05-03 11:53:33 +02:00
Mike Linksvayer
f92e91a72d improved wording suggested by @Zimmi48 2016-05-02 10:31:59 -07:00
Mike Linksvayer
213c5400bc re-add 'featured' field
was unused for choosealicense.com display after
https://github.com/github/choosealicense.com/pull/386

but choosealicense.com is vendored into licensee which eventually
is used in GitHub; 'featured' determines what is highlighted in
license drop-down eg at https://github.com/new
2016-04-26 12:22:15 -07:00
Mike Linksvayer
abef7e0bab state changes missing from 4 licenses which have condition
also drop 'significant' from description, does not correspond to
any license
2016-04-25 15:08:39 -07:00
Mike Linksvayer
c208a53107 Include 'copyleft', 'permissive', and 'public domain' in descriptions
Feedback from @waldyrious at
https://github.com/github/choosealicense.com/pull/396#issuecomment-213912884
2016-04-24 10:06:46 -07:00
Mike Linksvayer
7b4160681c Rework descriptions of 7 listed on /licenses
- primarily functional
- drop self-naming
- minimize requiring significant understanding of other licenses or
  copyright
- should be excruciatingly bland for anyone who already knows the licenses
  well; newcomers shouldn't have to deal with baggage immediately

Probably a few more words should be added to the xGPLv3s about their
stronger patent terms.

Licenses not listed on /licenses could be described in similar style.
2016-04-23 21:15:06 -07:00
Mike Linksvayer
8be0e5f8c2 rm patent-use permission field from GPLv2 and LGPLv2.1 metadata
There's a strong argument they have implied patent licenses, but
this site doesn't annotate any other implied patent licenses, as
one would expect given the description of the patent-use field "This
license provides an express grant of patent rights from the contributor
to the recipient."
2016-04-12 20:09:48 -07:00
Mike Linksvayer
b4cf070a82 rm no longer pertinent fields and tests 2016-04-07 18:48:15 -07:00
Mike Linksvayer
922d4d3f79 add missing descriptions, missing property, slight desc tweaks 2016-04-04 10:56:29 -07:00
Mike Linksvayer
9a5192cb21 AFL and OSL corrections 2016-04-02 17:54:21 -07:00
Waldir Pimenta
7c2763b747 Add list of projects using ISC (closes #377) 2016-03-28 19:06:40 +01:00
Mike Linksvayer
ca3a574513 Merge branch 'gh-pages' into adius-patch-1 2016-03-16 11:56:27 -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
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
7a68ceb7cf opportunistic https to kick CI 2016-03-14 01:01:05 -07: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
a4f990fe54 don't use markdown in note: field 2016-03-09 20:24:25 -08:00
Mike Linksvayer
068fe71365 Merge branch 'gh-pages' into pd-deduplication 2016-03-09 20:19:08 -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
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
1e7e054a26 Merge remote-tracking branch 'origin/gh-pages' into gplv3-home 2016-03-05 10:08:16 -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
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
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
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
W. Trevor King
a97a5bde53 cc-by-sa-4.0: Fix link to CC BY 4.0 (was self-reference)
Correct a typo from c81c90ba (conform to SPDX title to make tests
work, #353).
2016-02-24 14:07:49 -08:00
Mike Linksvayer
814bf9ac58 Merge pull request #353 from github/cc
Add qualifying CC licenses
2016-02-23 17:14:45 -08:00