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

363 Commits

Author SHA1 Message Date
Mike Linksvayer
5aa36a304d
update apache-2.0 examples to pass tests 2018-04-24 16:21:39 -07:00
Gram
326b883aba Actualize CC-BY licenses names
https://creativecommons.org/licenses/by/4.0/legalcode
2018-04-18 10:58:56 -07:00
Mike Linksvayer
b4db996481
UPL-1.0 (c) line use [year] and [fullname] fields 2018-04-12 11:30:29 -07:00
Mike Linksvayer
37429ccd9c examples should link to LICENSE files 2018-04-10 14:35:57 -07:00
Avi Miller
8d71adf6ce Merge branch 'gh-pages' of https://github.com/oracle/choosealicense.com into gh-pages 2018-04-10 13:13:42 -05:00
Avi Miller
62437700dd Updating the "using" section to list projects that are only
licensed under the UPL, instead of being dual licensed.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
2018-04-10 13:13:01 -05:00
Mike Linksvayer
4ccea129e3
use defaults 2018-04-10 10:18:43 -07:00
Avi Miller
da9fae2886 Fixed word wrap to 78 characters or less.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2018-04-10 11:27:26 -05:00
Avi Miller
119bff740a Updating upl-1.0.txt based on Travis failures. Fixing title
attribute first to confirm I understand the failure messages.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
2018-04-10 11:19:49 -05:00
Avi Miller
3ea34240f1 Adding the Universal Permissive License 1.0.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2018-04-10 09:06:28 -05:00
Mike Linksvayer
9e0a0e7b49
Merge branch 'gh-pages' into cc0-source-text 2018-01-30 16:28:36 -08:00
Mike Linksvayer
570ef6d1e0
sort examples 2018-01-04 14:07:37 -08:00
Matti Schneider
7d3a9527ec
Merge branch 'gh-pages' into patch-1 2018-01-05 10:48:39 +13:00
Matti Schneider
52a36d095f
fixup! Reference projects with unmodified license text 2018-01-05 10:43:53 +13:00
Matti Schneider
b0239b1610
Reference projects with unmodified license text
Licensee gem requires the text to not have any prefix
2018-01-05 10:39:25 +13:00
Matti Schneider
4863d6e863
fixup! Line wrap at 78 characters 2018-01-05 09:44:26 +13:00
Matti Schneider
372765db81
List three projects using EUPL 1.2 2018-01-04 17:59:16 +13:00
Mike Linksvayer
1e715f44b1 project_url -> projecturl 2018-01-02 18:09:38 -08:00
Mike Linksvayer
f2aabb8057
2 more examples 2017-12-29 15:18:11 -08:00
Mike Linksvayer
7b6067ed2c
Merge branch 'gh-pages' into epl-2.0 2017-12-29 14:58:54 -08:00
Mike Linksvayer
cd7b21ab7e
Merge branch 'gh-pages' into patch-1 2017-12-29 14:54:59 -08:00
Mike Linksvayer
102887fbeb use SPDX license list 3.0 2017-12-29 14:30:08 -08:00
Mike Linksvayer
6d535b774a
NCSA "developed by" ordering
"Development Group" comes before "Name of Institution", so `project` should come before `fullname` as these most closely correspond.

As noted in https://github.com/spdx/license-list-XML/pull/556
2017-12-26 13:15:29 -08:00
Mike Linksvayer
f589670554
Merge branch 'gh-pages' into patch-1 2017-12-06 09:35:55 -08:00
Mike Linksvayer
daa158b2c5
Merge branch 'gh-pages' into patch-1 2017-11-30 19:26:09 -08:00
Mike Linksvayer
5c75a337d5
Merge branch 'gh-pages' into epl-2.0 2017-11-27 13:20:23 -08:00
Mike Linksvayer
1cca51a128 MIT 2017-11-25 20:44:51 -08:00
Mike Linksvayer
d0caabb71e ISC examples 2017-11-25 20:38:49 -08:00
Mike Linksvayer
1a841848b3 ECL-2.0 examples 2017-11-25 20:32:19 -08:00
Mike Linksvayer
5130f12df1 Update GPLv3 examples 2017-11-25 20:27:20 -08:00
Mike Linksvayer
642783cf4b GPLv2 examples that can be detected 2017-11-25 20:15:01 -08:00
Mike Linksvayer
ec4197c0dd
Merge branch 'gh-pages' into patch-1 2017-11-24 15:49:01 -08:00
Mike Linksvayer
940131ee05
Merge branch 'gh-pages' into patch-1 2017-11-24 15:47:54 -08:00
Mike Linksvayer
39a0457d58
Merge branch 'gh-pages' into cc0-source-text 2017-11-24 14:34:34 -08:00
Mike Linksvayer
3532d9cbed Add EPL-2.0 2017-11-24 14:15:52 -08:00
Mike Linksvayer
775a2f2920 rm spurious indent, unnecessary field 2017-11-20 12:20:33 -08:00
Mike Linksvayer
48b00a5a6b update license texts from #489, avoid EPL-1.0 skip 2017-11-20 12:02:53 -08:00
Mike Linksvayer
644782b550 clearbsd from f4c8baf535 2017-11-19 19:29:02 -08:00
Mike Linksvayer
29a3b153e3 wrapped AFL-3.0, MS-PL, MS-RL taken from 8332159157 2017-11-19 14:21:19 -08:00
Mike Linksvayer
2d5a7244b4 update apache-2.0 using examples
- Apache HTTPD URL giving timeouts in CI
- Android license file isn't a simple example to copy from
+ Kubernetes, Elasticsearch are very high profile, with simple verbatim license files
2017-11-13 16:51:43 -08:00
Mike Linksvayer
d43130dc55 make wtfpl source: field point to url with license text 2017-11-13 16:01:45 -08:00
Josh Soref
ce1ee044a9 spelling: prohibition 2017-11-06 03:45:19 +00:00
Mike Linksvayer
efbd4a5ac8
Merge branch 'gh-pages' into patch-1 2017-11-04 10:53:21 -07:00
Mike Linksvayer
99378268a1 Merge https://github.com/github/choosealicense.com into patch-1 2017-11-04 10:51:27 -07:00
Mike Linksvayer
38a3be4898 restore square brackets from canonical versions 2017-10-24 14:48:49 -07:00
Mike Linksvayer
17d1196b31 replace 404 link 2017-10-24 11:22:07 -07:00
Mike Linksvayer
64ba25a22f remove link not found in canonical version 2017-10-18 17:16:11 -07: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
Mike Linksvayer
b6e4d57db5 Merge branch 'gh-pages' into patch-1 2017-10-17 18:30:24 -07:00
Mike Linksvayer
c02073ebdb Merge branch 'gh-pages' into patch-1 2017-10-08 18:50:34 -07:00
Mike Linksvayer
dd9a24fb78 Fix EUPL link that changed once again without redirect! 2017-10-04 14:03:08 -07:00
games647
ad0dc7d8c6
Use HTTPS if available 2017-10-01 21:04:07 +02:00
Mike Linksvayer
6709fa7d18 Merge branch 'gh-pages' into patch-1 2017-09-19 14:55:17 -07:00
Mike Linksvayer
9a8bd27017 swap example failing tests
Seems to be a very minor configuration problem with TLS for cgit.freedesktop.org, swapping out example so tests pass.
2017-09-19 14:45:18 -07:00
Mike Linksvayer
d70d1c18ac update broken link 2017-09-19 14:00:03 -07:00
Mike Linksvayer
d8310f8b81 Update EPL-1.0 examples
Each can be detected by licensee and is a non-legacy repo.
2017-09-19 13:31:33 -07:00
Mike Linksvayer
84ac214d7f Merge branch 'gh-pages' into cc0-source-text 2017-09-18 18:11:14 -07:00
Mike Linksvayer
69232e6fc3 Merge branch 'gh-pages' into patch-1 2017-07-28 09:08:26 -07:00
Laurent Joubert
a792218c0f Update cecill-2.1.txt
- Corrected link to TXT version
- Corrected text to right column width
- Updated "using" projects
2017-07-06 11:25:29 +02:00
Mike Linksvayer
65828e1d0f rm fields that should be defaulted to 2017-07-04 12:26:14 -07:00
Laurent Joubert
d9cbe3830c Added CeCILL Licenses v2.1 2017-07-04 18:26:48 +02:00
Damien Lecan
4df304625c Update according to https://fedoraproject.org/wiki/Licensing/PostgreSQL_License 2017-06-26 11:20:18 +02:00
Damien Lecan
8d7d579c3a Add missing [fullname] field 2017-06-26 11:13:01 +02:00
Mike Linksvayer
b8006f70d1 rm fields with default values 2017-06-25 13:56:27 -07:00
Damien Lecan
2e6e50f00f Provide examples compatible with license template 2017-06-24 23:02:26 +02:00
Damien Lecan
82e4edbb60 Use allowed fileds 2017-06-23 18:36:26 +02:00
Damien Lecan
8625394f3b Fix license name 2017-06-23 18:30:16 +02:00
Damien Lecan
25ecb23a40 Merge branch 'gh-pages' into gh-pages 2017-06-23 18:27:13 +02:00
Damien Lecan
fda503385d Initial revision 2017-06-23 18:24:51 +02:00
Matti Schneider
0b57486e2c Line wrap at 78 characters
As per CONTRIBUTING rules
2017-06-23 17:01:59 +02:00
Matti Schneider
bcbf76b178 Add EUPL v1.2 2017-06-22 09:55:18 +02:00
Haralan Dobrev
22a9b2bc80 Link to unlicense.org on HTTPS 2017-06-20 22:30:04 +03:00
Waldir Pimenta
22dc2dbe36 fix typo: soley --> solely 2017-06-18 23:40:11 +01:00
Waldir Pimenta
d7e5529839 fix typo: soley --> solely 2017-06-18 23:39:22 +01:00
John Jago
edf588b327 Replace dual-licensed example with RDF.rb 2017-06-10 12:45:38 -05:00
Jan
435252f5c0 Use docopt.rs as example for the Unlicense 2017-06-09 10:49:50 +02:00
Jan
03bf491cd4 Remove stacktrace.js as Unlicense example 2017-06-09 09:59:16 +02:00
Mike Linksvayer
1726b836bb make using required for new licenses 2017-05-30 14:17:13 -07:00
Mike Linksvayer
b3f003eba0 fix uncool EUPL link 2017-05-27 12:31:01 -07:00
Evan Ogas
3215952d39 Fix .NET Core license.txt url 2017-05-17 16:34:04 -04:00
Mike Linksvayer
b225f1f94b Example project moved its license file, update 2017-04-21 18:20:47 -07:00
Naren Dasan
d818ba67fa update developed by 2017-03-25 13:15:30 -07:00
Naren Dasan
7eb2639152 Update ncsa.txt 2017-03-24 12:51:02 -07:00
Naren Dasan
19544b0112 Matching SPDX over OSI 2017-03-24 12:45:18 -07:00
Naren Dasan
27570c5e3f Added different projects and typo 2017-03-24 12:39:36 -07:00
Mike Linksvayer
8e08db2e27 rm trademark-use limitation; this just has a non-endorsement clause 2017-03-24 11:47:47 -07:00
Mike Linksvayer
abff65e95d rm fields with default values 2017-03-24 11:40:33 -07:00
Naren Dasan
da0e011c66 Change hidden to true 2017-03-23 23:19:04 -07:00
Naren Dasan
c8ac779574 fix links 2017-03-23 22:50:03 -07:00
Naren Dasan
2247a46e7c distibute -> distribution 2017-03-23 21:49:33 -07:00
Naren Dasan
cae5457dfa Update ncsa.txt 2017-03-23 21:47:46 -07:00
Naren Dasan
d0af1481b0 links 2017-03-23 18:51:32 -07:00
Naren Dasan
e29f5d16d9 Update ncsa.txt 2017-03-23 18:45:40 -07:00
Naren Dasan
713b9b6020 Adding NCSA License 2017-03-23 18:41:20 -07:00
Mike Linksvayer
69ad10f6c9 []->{} consistency in ECL-2.0 appendix
See https://github.com/github/choosealicense.com/pull/494#issuecomment-287436948 and Apache-2.0 treatment here.
2017-03-20 10:13:37 -07:00
Matthew Buckett
388396f933 Dropped duplicate heading on ECL license. 2017-03-17 18:03:29 +00:00
Mike Linksvayer
52a73b8286 rm fields with default values 2017-03-17 10:42:31 -07:00
Matthew Buckett
2f005b33f9 Add ECL-2.0 License
The Educational Community License version 2.0 ("ECL") consists of the Apache 2.0 license, modified to change the scope of the patent grant in section 3 to be specific to the needs of the education communities using this license.
2017-03-17 11:20:57 +00:00
Mike Linksvayer
6b554b769f Use license text from source
The existing license text was introduced in https://github.com/github/choosealicense.com/pull/126 presumably by copying and pasting from https://creativecommons.org/publicdomain/zero/1.0/legalcode though I'm not sure how to explain the link at the end. Probably should be updated with https://creativecommons.org/publicdomain/zero/1.0/legalcode.txt or https://spdx.org/licenses/CC0-1.0.html ... latter marks disclaimer as optional and doesn't have first line "Creative Commons Legal Code". This commit uses former.

Making due to https://github.com/benbalter/licensee/issues/172 but holding off on merge pending more discussion there.
2017-03-04 10:26:17 -08:00
Mike Linksvayer
556c006266 Fix copyright line, which pertains to the license itself
See http://www.wtfpl.net/faq/
2017-03-02 17:37:03 -08:00
Jacob Mischka
092ad597e3
Change copyright date 2004 -> [year] in wtfpl 2017-03-02 19:18:44 -06:00
Mike Linksvayer
1ce6e03c5e simplify 2017-02-19 17:31:58 -08:00
Mike Linksvayer
6ae1f697d7 same-license--variations 2017-02-19 14:37:32 -08: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
Mike Linksvayer
570f69e4ec hidden: false for 'popular' licenses
- document criteria for whether a license is hidden
  - needed for license spectrum on /licenses OR
  - on 'popular' list at https://opensource.org/licenses (some other list could be used in the future)
- adjust license properties and tests accordingly

This gets non-hidden list back close to what it was before #386 and (pending licensee vendoring this change, licensee release, and github.com licensee dependency version bump) some commonly requested licenses (eg #413 #449) will reappear in the github.com license drop-down.
2016-09-26 11:20:44 -07:00
Mike Linksvayer
8de49ac800 alignment with other records
* same-license is not a limitation and doesn't apply in any way to BSL-1.0
* other licenses with a per-file notice recommendation get that added to the note field
* have the description mention the reason for this license existing, binary distribution without notices (IIUC)
* remove using: pending an example that can be followed by others and detected eg on GitHub, see https://github.com/github/choosealicense.com/blob/gh-pages/README.md#optional-fields and see #358 #372 #377
2016-09-16 15:40:36 -07:00
Jochen Topf
6a74345a6d Add Boost Software License 1.0. 2016-09-16 10:12:43 +02:00
Mike Linksvayer
e800e1c845 Remove variation in instructions for applying LGPLv3
Leaving only the option described in https://www.gnu.org/licenses/gpl-howto.html

Following from discussion at https://github.com/benbalter/licensee/pull/113#r78846987
2016-09-14 14:45:04 -07:00
Waldir Pimenta
e0b2b9294d unlicense: fix typo "kakokune" -->"kakoune" 2016-08-22 20:03:52 +01:00
Waldir Pimenta
9e6528c68f sort license properties in the order permissions > conditions > limitations (fixes #387) 2016-08-22 19:42:42 +01:00
Waldir Pimenta
e81e63e696 unlicense: add 3 popular projects using it 2016-08-22 18:24:02 +01:00
Sam Gluck
f44e11237b Fix source URL for ms-rl license 2016-07-24 09:47:39 +01:00
Mike Linksvayer
28c245adec small wording fix, see https://github.com/github/choosealicense.com/pull/440#issuecomment-230809370 2016-07-06 11:20:27 -07:00
Waldir Pimenta
cfa7104f85 Fix instructions for Artistic 2.0 (follow-up #333)
cf. #103, #310 and #333
cc @mlinksva, @benbalter, @bkeepers and @Haacked
2016-07-06 15:02:20 +01:00
Paul Chaignon
28f55954bf zlib license 2016-07-01 20:52:01 +02:00
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