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

37 Commits

Author SHA1 Message Date
Mike Linksvayer
5130f12df1 Update GPLv3 examples 2017-11-25 20:27:20 -08:00
Mike Linksvayer
e90b7c383a wording changes for <> fields to match canonical versions 2017-10-18 17:14:38 -07:00
Mike Linksvayer
d7dd72fdec {} -> <> in license trailer to more closely match canonical texts 2017-10-18 17:04:09 -07:00
games647
ad0dc7d8c6
Use HTTPS if available 2017-10-01 21:04:07 +02:00
Mike Linksvayer
57f7891273 no-liability -> liability, warranty
rename and add tag and associated descriptions

fixes #412
2016-12-12 14:29:25 -08:00
Waldir Pimenta
9e6528c68f sort license properties in the order permissions > conditions > limitations (fixes #387) 2016-08-22 19:42:42 +01: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
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
76970d1170 Merge branch 'gh-pages' into functional-descriptions 2016-05-03 14:44:18 -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
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
b4cf070a82 rm no longer pertinent fields and tests 2016-04-07 18:48:15 -07:00
Mike Linksvayer
1e7e054a26 Merge remote-tracking branch 'origin/gh-pages' into gplv3-home 2016-03-05 10:08:16 -08:00
Mike Linksvayer
ab3ee0061b take projects listed on homepage from license using property 2016-03-02 18:23:31 -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
0375c35382 *gpl nicknames reflect GNU usage 2016-02-17 15:19:24 -08:00
Mike Linksvayer
db18b5dfe6 apache version, GNU *gpl naming, in part via #335 2016-02-16 09:29:18 -08:00
Mike Linksvayer
c04ea11e17 Remove need for tab-slug 2016-02-12 15:51:44 -08:00
Ben Balter
8d24208088 Revert "upgrade to jekyll 3 due to"
This reverts commit 48c6e3e88785106d0a9357df8385f11891e85565.
2016-02-09 12:21:11 -05: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
Ben Balter
ed908356e7 make licenses hidden by default 2016-01-20 10:37:44 -05:00
Michal Nazarewicz
1422ea3386 Prefer (L)GPL 3.0 to 2.x.
The GPL v3 is an improvement over v2 fixing several issues and
increasing compatibility with other free software licenses.  As such
there is no reason to feature v2 prominently rather than v3.  See
http://www.gnu.org/licenses/rms-why-gplv3.en.html for more rationale.
2015-11-17 16:00:02 +01:00
Brandon Keepers
1a17c9a94c Merge pull request #305 from github/patent-use
Rename "Patent Grant" to "Patent Use"
2015-11-02 10:57:43 -05:00
Ben Balter
cb0bc5f40e Merge pull request #303 from github/remove-gpl-no-sublicense
Remove sublicense warning for GPL-3.0
2015-11-02 09:26:03 -05:00
Brandon Keepers
15ebedb726 Rename "Patent Grant" to "Patent Use"
Per the discussion in #168, the consumers of the softare are granted the right to use patents. So "Patent Use" makes more sense from a consumer perspective than "Patent Grant".
2015-11-01 22:51:13 -05:00
Brandon Keepers
eb56474487 Remove sublicense warning for GPL-3.0
From Section 10:

> Each time you convey a covered work, the recipient automatically
> receives a license from the original licensors, to run, modify and
> propagate that work, subject to this License.

Sublicensing is technically forbidden, but the copyleft makes the ability to sublicense irrelevant.
2015-11-01 21:41:21 -05:00
Waldir Pimenta
ba91c766d6 rename category --> family (fix #288) 2015-09-09 00:04:34 +01:00
Waldir Pimenta
f76e99330f Normalize sorting of license properties
Properties are now consistently sorted across all license files,
appearing in the following order:

**title**
nickname
tab-slug
redirect_from
category
variant
featured
hidden
**source**

**description**
**how**
note

using

**required**
**permitted**
**forbidden**
2015-09-06 18:59:27 +01:00
Ben Balter
915c08b821 move meta and fields to yaml 2015-08-22 15:25:16 -04:00
Ben Balter
4ba1ca5dac implement hidden licenses 2015-08-06 11:56:18 -04:00
Brandon Keepers
869573e054 Fix GPL v3.0 alias 2015-03-08 16:50:56 -07:00
Ben Balter
0ca328b53a add nicknames for license list 2015-03-07 14:11:34 -05:00
Ben Balter
530e15d771 validate SPDX compliance 2015-03-07 13:38:52 -05:00
Ben Balter
4fcffe2c6b downcase all licenses 2014-09-17 11:34:25 -04:00