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

36 Commits

Author SHA1 Message Date
Mike Linksvayer
1dd04f5530 run script/vendor-license-text 2019-07-09 14:08:08 -05:00
Mike Linksvayer
054b45b022
Merge branch 'gh-pages' into spdx-license-templates 2018-08-27 04:28:55 +00:00
Mike Linksvayer
2fae58c6cf run vendor script 2018-08-11 14:11:55 -07:00
Mike Linksvayer
325806b42a rm source metadata, defer to SPDX record 2018-08-04 14:07:24 -07:00
Mike Linksvayer
c45561b31a
Merge branch 'gh-pages' into spdx-license-templates 2017-11-27 16:10:05 -08:00
Mike Linksvayer
d0caabb71e ISC examples 2017-11-25 20:38:49 -08:00
Mike Linksvayer
46bc38814b simplify lines 2017-11-20 10:57:52 -08:00
Mike Linksvayer
9d6bccda17 hack in supported fields 2017-11-20 10:21:45 -08:00
Mike Linksvayer
eae239088e vendor from spdx-license-data repo, text directory 2017-11-19 17:25:29 -08:00
Mike Linksvayer
8332159157 Source SPDX HTML, wrap with pandoc to get closer to usable form 2017-11-19 13:49:31 -08:00
Mike Linksvayer
9406cb75c6
Merge branch 'gh-pages' into spdx-license-templates 2017-11-14 16:49:20 -08:00
games647
ad0dc7d8c6
Use HTTPS if available 2017-10-01 21:04:07 +02:00
Mike Linksvayer
b225f1f94b Example project moved its license file, update 2017-04-21 18:20:47 -07:00
Ben Balter
7e977146db
update vendored licenses with text from SPDX API 2017-03-05 17:41:00 -05: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
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
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
Waldir Pimenta
7c2763b747 Add list of projects using ISC (closes #377) 2016-03-28 19:06:40 +01:00
Adrian Sieber
0bd80e1bff Add name of license to ISC license text 2016-03-15 19:13:39 +01: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
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
Mike Linksvayer
440b44b5f4 remove all attempt to describe sublicensing permission/prohibitions 2016-01-31 14:56:40 -08:00
Ben Balter
ed908356e7 make licenses hidden by default 2016-01-20 10:37:44 -05:00
Waldir Pimenta
6cbb454cb6 Merge branch 'gh-pages' into rename-category-family 2015-09-25 18:13:19 +01:00
Ben Balter
4518291ad7 Merge pull request #286 from christianbundy/patch-1
Remove recommendation to add email address to ISC
2015-09-20 12:34:18 -04: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
Christian Bundy
7cb14ab9e0 Remove recommendation to add email address to ISC
Remove non-canonical license and usage text from f89201c
2015-09-01 16:28:18 -07:00
Ben Balter
915c08b821 move meta and fields to yaml 2015-08-22 15:25:16 -04:00
Ben Balter
530e15d771 validate SPDX compliance 2015-03-07 13:38:52 -05:00
Ben Balter
22cc77f12b first pass at jekyll2ification 2014-07-31 12:36:56 -04:00