Граф коммитов

59 Коммитов

Автор SHA1 Сообщение Дата
Brandon Keepers 7d4c11e390 Merge branch 'mina86-gh-pages' into gh-pages
* mina86-gh-pages:
  Fix GPL 3 link
  Prefer (L)GPL 3.0 to 2.x.
2015-11-22 14:10:15 -05:00
Brandon Keepers c2c8a67d28 Fix GPL 3 link 2015-11-22 14:04:27 -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
Waldir Pimenta cd0c12225d format 'using' property as a bulleted list (fixes #292) 2015-11-02 16:36:55 +00: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
Ben Balter 4e9d7bca05 Merge pull request #293 from waldyrious/rename-category-family
rename category --> family (fix #288)
2015-11-02 09:19:36 -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
Ben Balter 37c1d947cc update source text to canonical url 2015-10-31 13:17:56 -04:00
Ben Balter eda9fa97ec Use Mozilla's plaint text version of the MPL 2015-10-31 12:45:06 -04:00
Waldir Pimenta 6cbb454cb6 Merge branch 'gh-pages' into rename-category-family 2015-09-25 18:13:19 +01:00
Ben Balter 99fd693545 add description 2015-09-25 11:34:21 -04:00
Ben Balter 76eebea56e add AFL 2015-09-25 11:29:03 -04: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
Ben Balter de0dfaf146 hard wrap 2015-09-08 12:54:14 -04:00
Ben Balter c94abf0f84 Merge branch 'gh-pages' into matt40k-gh-pages 2015-09-08 12:46:14 -04:00
Ben Balter 1ddb0dc978 Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into clear-bsd 2015-09-08 12:43:38 -04: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
Matt Smith b96a48f34e Add how, removed layout and permalink
Appears the spec has been updated - lets hope this sorts it
2015-09-01 23:29:59 +01:00
Matt Smith 7e5f27a9ef Merge remote-tracking branch 'github/gh-pages' into gh-pages 2015-09-01 23:17:10 +01:00
Matt Smith d147b88cf1 Update ms-rl.txt 2015-09-01 23:14:42 +01:00
Matt Smith 54d48f0352 Update ms-pl.txt 2015-09-01 23:14:00 +01:00
Matt Smith 7258872c05 Update ms-rl.txt 2015-09-01 23:04:09 +01:00
Matt Smith c2ebe9bfe7 Update ms-pl.txt 2015-09-01 23:03:20 +01:00
Ben Balter 38704df34c normalize metadata 2015-08-22 16:44:23 -04:00
Ben Balter 3c8ca513cd Merge branch 'gh-pages' into clear-bsd 2015-08-22 16:41:05 -04:00
Ben Balter 16ae83ada5 Merge branch 'gh-pages' into clear-bsd 2015-08-22 16:40:07 -04:00
Ben Balter df0fd9213f add rules spec 2015-08-22 15:42:12 -04:00
Ben Balter 915c08b821 move meta and fields to yaml 2015-08-22 15:25:16 -04:00
Ben Balter 5c47718e72 fix up wtfpl; 2015-08-19 16:46:40 -04:00
Ben Balter ca7c100e2a fix ofl title 2015-08-19 16:23:55 -04:00
Ben Balter c9bf0edc20 rename ofl so tests pass 2015-08-19 16:23:48 -04:00
Ben Balter a6110b62e4 fix ofl title 2015-08-19 16:19:59 -04:00
Ben Balter d37cb1e96b rename ofl so tests pass 2015-08-19 16:19:37 -04:00
Ben Balter 5b224fbf9a add clear BSD 2015-08-19 16:14:26 -04:00
Matt Smith 39eed4dccb Merge remote-tracking branch 'upstream/gh-pages' into gh-pages 2015-08-14 14:39:17 +01:00
Matt Smith 12adf39a19 Update ms-rl.txt 2015-08-14 14:33:08 +01:00
Matt Smith 9c7b036fcd Update ms-pl.txt 2015-08-14 14:32:07 +01:00
Ben Balter 3ed0867bb1 normalize license instructions 2015-08-07 11:35:27 -04:00
Ben Balter f560cc5188 fix new license paths 2015-08-07 11:33:28 -04:00
Ben Balter 4ba1ca5dac implement hidden licenses 2015-08-06 11:56:18 -04:00
Matt Smith e2dc70b74f bugfix
Missed 'License' from name - SPDX compliance
2015-05-29 01:27:48 +01:00
Matt Smith 2f17a6af22 MS Open Source licenses
Add the the Microsoft Open Source licenses which are heavily used on
Codeplex
2015-05-29 01:10:58 +01:00
Ben Balter c0ca64aae4 Merge pull request #247 from real-or-random/patch-1
Applying the LGPL v3 correctly
2015-04-28 12:05:46 -04:00
lord63 4908ddf1c1 Update bsd-3-clause.txt
Replace the not exist {organizetion} option with [project].
2015-04-06 11:30:45 +08: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