1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-06 03:38:49 +01:00
Commit Graph

1165 Commits

Author SHA1 Message Date
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
Jacob Mischka
092ad597e3
Change copyright date 2004 -> [year] in wtfpl 2017-03-02 19:18:44 -06:00
Mike Linksvayer
1e4f3a2ccf Merge pull request #484 from github/same-license--mod
same-license--variations
2017-02-22 15:52:56 -08:00
Mike Linksvayer
1ce6e03c5e simplify 2017-02-19 17:31:58 -08:00
Mike Linksvayer
b240450ca9 add same-license-- variations to README 2017-02-19 14:59:25 -08:00
Mike Linksvayer
6ae1f697d7 same-license--variations 2017-02-19 14:37:32 -08:00
Mike Linksvayer
d99a0a9b4d Merge pull request #482 from Phineas/patch-1
Update LICENSE Copyright Date to 2017
2017-02-15 12:34:05 -08:00
Phineas
fef584ce1a Update LICENSE Copyright Date to 2017 2017-02-15 20:29:30 +00:00
Mike Linksvayer
1177eb0254 Merge pull request #480 from github/opensourceguide
Link to Open Source Guide on The Legal Side of Open Source
2017-02-14 13:41:27 -08:00
Mike Linksvayer
7eb19e1368 Link to Open Source Guide on The Legal Side of Open Source
https://opensource.guide/legal/ one of a set of guides released today https://github.com/blog/2318-announcing-open-source-guides

For now just adding as an additional resource, eventually should be worked into home and/or licenses pages.
2017-02-14 13:22:06 -08:00
Mike Linksvayer
ebc559d30e Merge pull request #477 from github/rubocop-ruby-2.3
make rubocop ruby version match pages ruby version
2017-01-21 12:40:01 -08:00
Mike Linksvayer
f08ace3feb make rubocop ruby version match pages ruby version 2017-01-18 13:31:19 -08:00
Mike Linksvayer
8a2dff3f74 Merge pull request #476 from github/http-img-check
Check images for consistent use of http/https
2017-01-18 12:05:51 -08:00
Mike Linksvayer
8360759d87 https in config/test strip, maybe no functional difference 2017-01-18 11:58:54 -08:00
Mike Linksvayer
472237f872 don't bump rubocop to 2.3 yet 2017-01-17 14:10:51 -08:00