1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 21:00:10 +01:00

892 Commits

Author SHA1 Message Date
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
Brandon Keepers
369bf42e8c Remove background image 2015-09-18 14:45:34 -04:00
Waldir Pimenta
a9f9398705 use 'ruletype' in app.coffee for clarity 2015-09-09 00:24:05 +01:00
Waldir Pimenta
ba91c766d6 rename category --> family (fix #288) 2015-09-09 00:04:34 +01:00
Ben Balter
421f136c14 Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into gh-pages 2015-09-08 12:54:49 -04:00
Ben Balter
de0dfaf146 hard wrap 2015-09-08 12:54:14 -04:00
Ben Balter
2b0df6c6fd Merge pull request #266 from matt40k/gh-pages
MS Open Source licenses
2015-09-08 12:46:41 -04:00
Ben Balter
c94abf0f84 Merge branch 'gh-pages' into matt40k-gh-pages 2015-09-08 12:46:14 -04:00
Ben Balter
352284d5e8 Merge pull request #278 from github/clear-bsd
Add clear BSD
2015-09-08 12:44:06 -04:00
Ben Balter
1ddb0dc978 Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into clear-bsd 2015-09-08 12:43:38 -04:00
Ben Balter
dba350e8dc Merge pull request #258 from waldyrious/sort-license-properties
Normalize sorting of license properties
2015-09-08 12:41:27 -04:00
Waldir Pimenta
f76e99330f Normalize sorting of license properties
Properties are now consistently sorted across all license files,
appearing in the following order:

**title**
nickname
tab-slug
redirect_from
category
variant
featured
hidden
**source**

**description**
**how**
note

using

**required**
**permitted**
**forbidden**
2015-09-06 18:59:27 +01:00
Christian Bundy
7cb14ab9e0 Remove recommendation to add email address to ISC
Remove non-canonical license and usage text from f89201c
2015-09-01 16:28:18 -07:00
Matt Smith
b96a48f34e Add how, removed layout and permalink
Appears the spec has been updated - lets hope this sorts it
2015-09-01 23:29:59 +01:00
Matt Smith
7e5f27a9ef Merge remote-tracking branch 'github/gh-pages' into gh-pages 2015-09-01 23:17:10 +01:00
Matt Smith
d147b88cf1 Update ms-rl.txt 2015-09-01 23:14:42 +01:00