1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-05 19:28:50 +01:00
Commit Graph

1179 Commits

Author SHA1 Message Date
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
2e9a308c6e Merge pull request #514 from github/require-using
Require 3 detectable examples for newly added licenses
2017-05-30 14:43:54 -07:00
Mike Linksvayer
b721ecba5b word for better reading 2017-05-30 14:24:57 -07:00
Mike Linksvayer
ffe59c7a5b license text should match that of SPDX record 2017-05-30 14:22:13 -07:00
Mike Linksvayer
1726b836bb make using required for new licenses 2017-05-30 14:17:13 -07:00
Mike Linksvayer
c2888f1e1e Merge pull request #512 from github/pages-ruby-24
Update CI & rubocop to use ruby 2.4, catching up to GitHub Pages
2017-05-27 12:38:47 -07:00
Mike Linksvayer
b3f003eba0 fix uncool EUPL link 2017-05-27 12:31:01 -07:00
Mike Linksvayer
ed8a4b497c pages now using ruby 2.4.0 2017-05-27 12:30:43 -07:00
Mike Linksvayer
46ce0aea5a Merge pull request #510 from grv87/patch-1
Update external hyperlinks in CONTRIBUTING.md
2017-05-21 10:19:39 -07:00
Basil Peace
00c95e4d77 Update external hyperlinks in CONTRIBUTING.md 2017-05-21 18:12:26 +03:00
Mike Linksvayer
770481d5e9 Merge pull request #509 from eogas/gh-pages
Fix .NET Core license.txt url
2017-05-17 13:44:51 -07:00
Evan Ogas
3215952d39 Fix .NET Core license.txt url 2017-05-17 16:34:04 -04:00
Mike Linksvayer
b356254902 Merge pull request #506 from github/isc-id-md
Example project moved its license file, update
2017-04-21 18:27:01 -07:00
Mike Linksvayer
b225f1f94b Example project moved its license file, update 2017-04-21 18:20:47 -07:00
Mike Linksvayer
749f888114 Merge pull request #502 from floatingatoll/patch-1
De-capitalize one mistakenly-capitalized 'License'
2017-04-08 22:43:28 -07:00
Mike Linksvayer
aa33c8071b satisfy rubocop 0.48.1 2017-04-08 22:40:27 -07:00
floatingatoll
d171cf3c22 De-capitalize one mistakenly-capitalized 'License'
The surround text (and following items) use the phrase "Same license" and no evidence is present of capitalization of License as a proper noun in this text.
2017-04-08 21:23:05 -07:00
Mike Linksvayer
4ecd7838a4 Merge pull request #497 from narendasan/ncsa
Adding the University of Illinois/NCSA License
2017-03-27 18:10:38 -07:00
Mike Linksvayer
96cd5a821c Merge branch 'gh-pages' into ncsa 2017-03-27 18:06:22 -07:00
Mike Linksvayer
c57c0d3a1e Merge pull request #500 from github/inconsistent-you
Don't inlcude 'you' in any rule descriptions
2017-03-27 08:43:45 -07:00
Mike Linksvayer
ec57a36433 spel 2017-03-27 08:35:39 -07:00
Mike Linksvayer
75c05d717c mindlessly satisfy rubocop 0.48 2017-03-26 17:19:44 -07:00
Mike Linksvayer
aeca75a53b Don't inlcude 'you' in any rule descriptions
Descriptions should make sense whether reader is licensor or licensee
2017-03-26 16:56:26 -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
a8a6690bdc Merge pull request #495 from github/ecl-2.0-curly
[]->{} consistency in ECL-2.0 appendix
2017-03-20 10:17:31 -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
Mike Linksvayer
f2a7aa143c Merge pull request #494 from buckett/ecl-2.0
Add ECL-2.0 License
2017-03-20 10:10:36 -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
d4e07bf80f Merge pull request #491 from github/additional-choosing
focus additional resources on choosing an open license, not lists of licenses
2017-03-15 11:49:53 -07:00
Mike Linksvayer
77419ec696 Merge branch 'gh-pages' into additional-choosing 2017-03-15 11:47:08 -07:00
Ben Balter
b13e020b08 Merge pull request #492 from github/sentance-case
Convert rule labels to sentance case
2017-03-15 10:09:52 -04:00
Ben Balter
401fbf5fc0
convert rule labels to sentance case 2017-03-14 19:44:38 -04:00
Mike Linksvayer
ada5a49769 focus additional resources on choosing an open license, not lists of licenses
Fixes #490 which was concerned that the additional resources list did not include all like items, I understand driven by concern that the SPDX license list includes non-open licenses. So does the FSF license list -- worse, it even recommends some.

This fix focuses the list on resources about choosing an open license, not resources listing a bunch of licenses. Fortunately both OSI and FSF have pages directly addressing choosing a license.

I've removed the SPDX and English Wikipedia lists.
2017-03-14 11:39:34 -07:00
Mike Linksvayer
6c36a601a0 Merge pull request #486 from jacobmischka/fix-wtfpl
Change copyright date 2004 -> [year] in wtfpl
2017-03-02 17:40:42 -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