1
0
mirror of https://github.com/github/choosealicense.com synced 2024-06-30 23:53:02 +02:00
Commit Graph

775 Commits

Author SHA1 Message Date
Mike Linksvayer
d5c23e2871 spel & mention lowercase spdx id w/example 2016-01-25 09:53:33 -08:00
Ben Balter
fbef68f89b make it clear that license should be the spdx id 2016-01-20 10:43:57 -05:00
Ben Balter
ad1c2d9684 Catch invalid SPDX IDs when looking for the SPPX name, fixes #322 2016-01-20 10:42:36 -05:00
Ben Balter
5531742d10 better error output 2016-01-20 10:20:04 -05:00
Mike Linksvayer
b7204165de Merge pull request #311 from mlinksva/tm-accuracy
Increase accuracy re trademark clauses
2016-01-18 14:27:52 -08:00
Ben Balter
58e9faeedf Merge pull request #318 from github/approval-script
Add script to check approval of a license.
2016-01-18 17:14:22 -05:00
Ben Balter
e505eb8fb9 check if license is aleady a license 2016-01-18 17:05:02 -05:00
Ben Balter
4013339bfd add fuzy match 2016-01-18 16:39:03 -05:00
Ben Balter
8de56f6e6f spelling 2016-01-18 16:20:33 -05:00
Ben Balter
6bc145a0de add code search 2016-01-18 16:19:29 -05:00
Ben Balter
8e56bb8315 add script/check-approval 2016-01-18 16:16:40 -05:00
Ben Balter
7a32aad01b add link to contributing from README 2016-01-18 15:35:06 -05:00
Ben Balter
46be738264 Merge pull request #316 from github/new-license-criteria
Document criteria for proposing new licenses
2016-01-18 15:33:53 -05:00
Ben Balter
c8012557a4 move FSF fix to the fsf_approved_licenses helper 2016-01-18 15:32:17 -05:00
Ben Balter
42e559a962 bullet point contributing instructions 2016-01-18 15:28:22 -05:00
Ben Balter
5e897e30b3 fix comment typo 2016-01-18 15:19:53 -05:00
Ben Balter
f7d68094e4 add gemfile to get tests to work 2016-01-15 18:08:04 -05:00
Ben Balter
976acac003 downgrade html proofer 2016-01-15 18:04:44 -05:00
Ben Balter
698d603cc9 run spec before proofer 2016-01-15 18:04:07 -05:00
Ben Balter
415ac8a174 fix spec 2016-01-15 18:01:07 -05:00
Ben Balter
853f4c97b2 check for license compliance 2016-01-15 17:40:32 -05:00
Mike Linksvayer
b0e7fd5a60 typos 2016-01-05 12:22:07 -08:00
Ben Balter
790109f099 add criteria for proposing new licenses 2016-01-05 14:48:06 -05:00
Mike Linksvayer
16bd726fd0 empty commit to force integration re-check 2015-12-15 17:03:54 -08:00
Ben Balter
fcc437a174 Merge pull request #312 from github/ignore-tldr
Ignore TL;DR Legal when running tests
2015-12-14 16:22:19 -05:00
Ben Balter
1c3ad39865 ignore tldr legal when running tests 2015-12-14 16:15:44 -05:00
Mike Linksvayer
587e104dc8 BSD and OFL licenses have no endorsement clauses, not explicit
non-grant of trademark rights.

Generalize description of trademark a bit to 'or' include other
marks, as some licenses include others, though trademark the only
universal among such licenses.
2015-12-14 11:15:38 -08:00
Mike Linksvayer
54de9d0e86 Slightly increase accuracy of trademark info:
- use not directly forbideen by certain licenses, rather rights not granted
- CC0-1.0 is one of those licenses with explicit non-grant
2015-12-14 11:03:17 -08:00
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
Brandon Keepers
5abee34bbb Merge pull request #306 from waldyrious/using-bullet-list
format 'using' property as a bulleted list (fixes #292)
2015-11-22 13:50:30 -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
b2eed043eb make sidebar template match the new format of the 'using' list 2015-11-02 16:36:55 +00: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
Brandon Keepers
4e6646b007 Merge pull request #304 from github/ignore-ruby-version
Ignore .ruby-version
2015-11-02 09:24:43 -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
4b33b6650b Actually remove .ruby-version 2015-11-02 09:19:32 -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
61d59ffc59 Remove ruby version from Gemfile 2015-11-01 22:02:31 -05:00
Brandon Keepers
cf4085efe0 Ignore .ruby-version 2015-11-01 21:46:05 -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
5feefc222c properly escape title in breadcrumb 2015-10-31 14:32:29 -04:00
Ben Balter
7b8c1a5433 Merge pull request #302 from github/compare-plaintext-mpl
Use Mozilla's plaint text version of the MPL
2015-10-31 14:17:18 -04: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
Ben Balter
44b315f6bf Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into gh-pages 2015-10-30 13:29:47 -04:00
Ben Balter
2db11a04bb add jekyll-seo-tag 2015-10-30 13:29:42 -04:00
Ben Balter
c85e54523b Merge pull request #301 from OmgImAlexis/gh-pages
Replaced zeroclipboard with clipboard.js
2015-10-25 16:42:35 -04:00