docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-12-31 09:01:44 +01:00
Code Issues Releases Wiki Activity
1,346 Commits 3 Branches 0 Tags 5.1 MiB
Commit Graph

1346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Mike Linksvayer
1a728bdd26 disable rubocop check new in 0.47 
Avoid:

```
spec/license_spec.rb:3:1: C: Metrics/BlockLength: Block has too many lines. [40/25]
describe 'licenses' do ...
^^^^^^^^^^^^^^^^^^^^^^
spec/license_spec.rb:8:3: C: Metrics/BlockLength: Block has too many lines. [35/25]
  licenses.each do |license| ...
  ^^^^^^^^^^^^^^^^^^^^^^^^^^
spec/license_spec.rb:9:5: C: Metrics/BlockLength: Block has too many lines. [33/25]
    context "The #{license['title']} license" do ...
    ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
```

Doesn't seem worth refactoring, but happy to be wrong.
 2017-01-17 13:37:52 -08:00
Brandon Keepers
db878ed8f9
Check images for consistent use of http/https 2017-01-17 11:59:22 -08:00
Mike Linksvayer
f982e7c419 Merge pull request #474 from github/putdown-old-script 
Putdown one-use downcase script
 2017-01-11 08:51:25 -08:00
Mike Linksvayer
dcea53171e Putdown one-use downcase script 
Seems to be one-time use https://github.com/github/choosealicense.com/pull/221 and doesn't need to stick around.

Side note: I wondered what was going on with the double rename. I guess to make work with case insensitive file systems, which I had forgotten about.
 2017-01-10 17:23:54 -08:00
Mike Linksvayer
8dd25de01f Merge pull request #473 from github/ci-ruby-version-test 
check .travis.yml ruby verison matches pages
 2017-01-04 08:56:51 -08:00
Mike Linksvayer
fad13d2de4 document fixing error in test output 
https://github.com/github/choosealicense.com/pull/473#issuecomment-270185138
 2017-01-04 08:53:18 -08:00
Mike Linksvayer
7de7b2c8ef affirmative wording 
https://github.com/github/choosealicense.com/pull/473#discussion_r94403400
 2017-01-03 10:18:27 -08:00
Mike Linksvayer
7b4890ddf6 check .travis.yml ruby verison matches pages 
https://github.com/github/choosealicense.com/pull/472#issuecomment-270048688

very rough, naive, probably bad implementation
 2017-01-02 21:28:12 -08:00
Mike Linksvayer
d413d0a334 Merge pull request #472 from guiscaranse/patch-2 
Update ruby version in travis.yml
 2017-01-02 19:56:05 -08:00
Mike Linksvayer
fd6fb2846a bump to 2.3.3 to match pages version 2017-01-02 19:51:46 -08:00
Guilherme Scaranse
8bb03bb4e3 Update ruby version in travis.yml 
Nokogiri requires ruby >= 2.1.0 to be used, and fails to complete travis build
 2017-01-02 22:28:14 -02:00
Mike Linksvayer
4b39f96c2a Merge pull request #467 from github/warranty 
no-liability -> liability, warranty
 2016-12-25 11:46:35 -08:00
Mike Linksvayer
f7cdfa1e96 Merge branch 'gh-pages' into warranty 2016-12-21 12:11:30 -08:00
Mike Linksvayer
e308dc31ec Merge pull request #469 from github/notice-general 
notices with code->software
 2016-12-21 12:10:19 -08:00
Mike Linksvayer
234d416f73 notices with code->software 
notice condition of open source licenses usually for any distribution, not only source code form

fixes #272
 2016-12-19 10:48:25 -08:00
Mike Linksvayer
b9905b11dd Merge branch 'gh-pages' into home-reform 2016-12-12 19:27:18 -08:00
Mike Linksvayer
b6303411de Merge branch 'gh-pages' into warranty 2016-12-12 19:26:53 -08:00
Mike Linksvayer
c43ee38d12 Merge pull request #468 from github/cowan-wizard 
New home for John Cowan's license selection wizard
 2016-12-12 19:26:36 -08:00
Mike Linksvayer
74ec63ec1b order gems so rubocop doesn't complain 2016-12-12 17:36:13 -08:00
Mike Linksvayer
a0120c2f21 New home for John Cowan's license selection wizard 
Waybacked in c008a5fbef, Cowan now has a new home, updating to that.
 2016-12-12 17:21:28 -08:00
Mike Linksvayer
ff7cfdc44c order gems so rubocop doesn't complain 2016-12-12 14:34:21 -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
bba25c9cbb Merge pull request #459 from anandtrex/gh-pages 
Adding a link in the about page to FSF's advice on how to choose a license
 2016-10-10 15:27:03 -07:00
Mike Linksvayer
306ffb0194 fold 2 FSF links into one bullet 2016-10-10 15:25:29 -07:00