docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-11-10 05:28:52 +01:00
Code Issues Releases Wiki Activity
1,660 Commits 2 Branches 0 Tags 5.1 MiB
df2920d76f
Commit Graph

1660 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Aidan Feldman
35e1e9387a tweak wording on the non-code page to not actually make a recommendation 2015-11-02 12:43:20 -05:00
Aidan Feldman
b24913bb5e Merge remote-tracking branch 'origin/gh-pages' into content-B 2015-11-02 12:35:14 -05: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
Alexis Tyler
bf4f854060 Replaced zeroclipboard with clipboard.js 2015-10-25 15:17:13 +10:30
Ben Balter
b2f7559002 Merge pull request #300 from github/dat-seo 
Minor SEO optimizations
 2015-10-24 13:14:37 -04:00
Ben Balter
54ea122be1 evern shorter short description 2015-10-23 18:17:01 -04:00
Ben Balter
a995dbd650 implement the 👌 suggestions of @leeereilly 2015-10-23 18:14:36 -04:00
Ben Balter
d882e69ec1 add microdata site name 2015-10-23 18:12:39 -04:00
Ben Balter
2caf7043fa add json-ld breadcrumbs 2015-10-23 18:10:21 -04:00
Ben Balter
c5e3673ced add description to tos 2015-10-23 18:00:26 -04:00
Ben Balter
6b4b8546f0 add desc to no-license 2015-10-23 17:59:08 -04:00
Ben Balter
34368e5c32 add fallback description 2015-10-23 17:58:46 -04:00
Ben Balter
4f54fc5c07 add seo include 2015-10-23 17:50:25 -04:00
Waldir Pimenta
6cbb454cb6 Merge branch 'gh-pages' into rename-category-family 2015-09-25 18:13:19 +01:00
Ben Balter
df6848b338 Merge pull request #296 from github/afl 
Add AFL 3.0 as a hidden license
 2015-09-25 11:38:38 -04:00
Ben Balter
99fd693545 add description 2015-09-25 11:34:21 -04:00
Ben Balter
76eebea56e add AFL 2015-09-25 11:29:03 -04:00
Brandon Keepers
1307353be4 Merge pull request #295 from github/avoid-flash-detection 
Remove flash detection
 2015-09-20 13:14:20 -04:00
Brandon Keepers
b25359847e Merge pull request #294 from github/remove-bg 
Remove background
 2015-09-20 13:11:54 -04:00
Ben Balter
4518291ad7 Merge pull request #286 from christianbundy/patch-1 
Remove recommendation to add email address to ISC
 2015-09-20 12:34:18 -04:00
Brandon Keepers
4abf1f6a57 Merge remote-tracking branch 'origin/gh-pages' into mjastrzebowski-gh-pages 
* origin/gh-pages: (162 commits)
  hard wrap
  Normalize sorting of license properties
  Add how, removed layout and permalink
  Update ms-rl.txt
  Update ms-pl.txt
  Update ms-rl.txt
  Update ms-pl.txt
  normalize metadata
  add bsd-3-clause-clear to whitelist
  add rules spec
  whitespace
  rename to license_category
  move meta and fields to yaml
  formalize whitelist
  Revert "remove OSI appoval requirement"
  remove OSI appoval requirement
  fix up wtfpl;
  smart license list filtering
  fix ofl title
  rename ofl so tests pass
  ...
 2015-09-19 23:15:01 -04:00
Brandon Keepers
8d63ba64f8 Remove flash detection 
Accurate flash detection is a little more complicated than this. The
current code causes an error on IE 10.

This removes the attempt to detect if flash is available. Instead, it
attempts to initialize ZeroClipboard and sets up the fallback.
ZeroClipboard will be a no-op if flash is not available, in which case
the fallback will already be configured. If flash is available, it will
put a flash object over the button and the fallback will never get
called.
 2015-09-19 22:46:18 -04:00
Brandon Keepers
71af572977 monotone colors 2015-09-18 14:45:55 -04:00