docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-11-09 04:58:52 +01:00
Code Issues Releases Wiki Activity
959 Commits 2 Branches 0 Tags 5.1 MiB
1aef5cd845
Commit Graph

959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Balter
8a542b1268 Merge branch 'gh-pages' of https://github.com/alejandrosantana/choosealicense.com into alejandrosantana-gh-pages 2014-06-17 11:52:25 -04:00
Ben Balter
33e00d098e use jsonify to build license json 2014-06-17 11:41:40 -04:00
Ben Balter
74f0cbddc8 Merge pull request #206 from ciarand/fix-licenses-dot-json-endpoint 
Remove licenses.json from the exclude list
 2014-06-17 11:36:44 -04:00
Alejandro Santana
e0666e52ce [IMP] Added redirect_from policy to agpl-v3.txt 2014-06-17 11:34:31 +02:00
Ciaran Downey
fc3f332966 Remove licenses.json from the exclude list 2014-06-16 16:15:14 -07:00
Ben Balter
7e6a492a57 Merge pull request #197 from kappa7194/patch-1 
Missing "patent grant" feature in AGPL
 2014-06-15 21:00:40 -04:00
Ben Balter
97be9eef9a Merge branch 'juanfra684-isc' into gh-pages 2014-06-14 15:00:04 -04:00
Ben Balter
a9ee5cf9cb make ISC primary BSD-style license 2014-06-14 14:59:49 -04:00
Ben Balter
a79db54b5d Merge branch 'isc' of https://github.com/juanfra684/choosealicense.com into juanfra684-isc 2014-06-14 14:47:50 -04:00
Alejandro Santana
b744b704ba [DEL] Deleted agpl-v1.txt and agpl-v2.txt to avoid bloating, as agpl-v3 is intented to replace those previous versions. 2014-06-06 18:42:00 +02:00
Alejandro Santana
f4260aad10 [FIX] Fixed tab-slug in agpl-v3.txt 2014-06-05 09:53:47 +02:00
Alejandro Santana
9628170ed4 [FIX][ADD] Renamed agpl.txt to agpl-v3.txt to match the license contained (GNU AGPL-v3). Also added licenses agpl-v1.txt and agpl-v2.txt (not GNU) 2014-06-05 09:49:53 +02:00
Juan Francisco Cantero Hurtado
52adce23ab Typo 2014-06-02 22:31:22 +02:00
Derek Jones
68a4d929a8 Adding note linking to Rosen's OSL 3.0 Explained 2014-05-14 12:27:38 -07:00
Derek Jones
a129278d69 Adding OSL 3.0 2014-05-14 12:20:42 -07:00
Ben Balter
d2c3db8a7d Merge pull request #199 from pathawks/sitemap 
Use jekyll-sitemap plugin
 2014-05-09 08:43:03 -04:00
Pat Hawks
2c5a524778 bundle update 2014-05-08 22:28:29 -07:00
Pat Hawks
0dbb5bfa8d Use *jekyll-sitemap* plugin for sitemap 2014-05-06 18:34:22 -07:00
Albireo
7a80bef759 Missing "patent grant" feature in AGPL 
The AGPL license is missing the "patent grant" feature in the "permitted" category.

Unless I'm mistaken [section 11](http://www.gnu.org/licenses/agpl-3.0.html#section11) of the license is about granting patents licenses (it's the same text found in [GPLv3's section 11](http://www.gnu.org/licenses/gpl-3.0.html#section11)).
 2014-04-22 12:14:48 +02:00
Juan Francisco Cantero Hurtado
6e0cce18e1 Merge branch 'gh-pages' into isc 2014-04-10 20:02:52 +02:00
Phil Haack
1b7cfc9724 Merge pull request #193 from shinnn/gh-pages 
Update the year of copyright to 2014
 2014-02-15 19:52:29 -08:00
shinnn
8dc995b3b0 Update URL of TLDRLegal 2014-02-16 12:52:16 +09:00
shinnn
435a5c496f update the year of copyright to 2014 2014-02-16 11:31:20 +09:00
Ben Balter
2fd33d1956 Merge pull request #192 from github/patch-zeroclipboard-swf 
Move bower assets to assets/vendor so we can properly version the zeroclipboard swf
 2014-01-31 17:19:40 -08:00
Ben Balter
7b2e34b717 exclude bundle so CI passes 2014-01-31 20:18:55 -05:00
Ben Balter
4b1e2b8c2b move bower to assets/vendor so we can version the swf 2014-01-31 20:11:03 -05:00
Ben Balter
28755fd27f Merge pull request #190 from github/bower2 
Version third party libraries with Bower
 2014-01-31 11:28:50 -08:00
Ben Balter
df100c9348 bower *all* the things 2014-01-31 14:25:45 -05:00
Phil Haack
23e7510139 Merge pull request #189 from XhmikosR/gh-pages 
Update libraries.
 2014-01-28 13:23:31 -08:00
XhmikosR
0b3e63d82c Update normalize.css to v3.0.0. 2014-01-28 20:24:07 +02:00
XhmikosR
13a55ffc4a Update ZeroClipboard to v1.3.1. 2014-01-28 20:23:14 +02:00
Phil Haack
adbb003412 Merge pull request #188 from github/i-want-freezing-lanas 
Remove google verification header
 2014-01-27 09:20:31 -08:00
Phil Haack
fae11df56c Remove google verification header 
I don't think we need this now that we've verified the site.
 2014-01-27 09:20:20 -08:00
Phil Haack
612117e189 Merge pull request #186 from github/how-about-laughing-octo-hipsters 
Remove sitemap.xsl
 2014-01-26 21:37:52 -08:00
Phil Haack
43c9c5b27c Remove sitemap.xsl 2014-01-26 21:33:27 -08:00
Phil Haack
2d9dc6458d Merge pull request #185 from github/webmaster-tools-meta-tag 
Add meta tag for google webmaster tools
 2014-01-26 21:27:00 -08:00
Phil Haack
f632357a8e Add meta tag for google webmaster tools 2014-01-26 21:26:48 -08:00
Phil Haack
07b61d82ee Merge pull request #184 from XhmikosR/whitespace 
Revert 13c9eb92fb.
 2014-01-24 10:10:29 -08:00
XhmikosR
769b6a6e48 Revert 13c9eb92fb. 
Due to Jekyll outputting useless whitespace, we need to work around this ourselves.
 2014-01-24 19:56:32 +02:00
Phil Haack
24e9effec1 Merge pull request #182 from XhmikosR/sitemap 
Generate sitemap.xml and add robots.txt.
 2014-01-24 09:16:26 -08:00
Phil Haack
a8afacad70 Merge pull request #181 from XhmikosR/markdownify 
Markdownify
 2014-01-24 09:16:02 -08:00
XhmikosR
1e24124ddc sitemap.xml: exclude pages with layout: nil. 2014-01-24 08:40:39 +02:00
XhmikosR
6211c56b68 index.html: specify permalink. 
This way we don't get `http://choosealicense.com/index.html` in sitemap.
 2014-01-24 08:25:40 +02:00
XhmikosR
fcfc139ad1 Simplify quotes and apostrophes. 2014-01-23 22:27:31 +02:00
XhmikosR
d40409be96 Revert 26bb900113. 
Jekyll already takes care of those.
 2014-01-23 22:27:31 +02:00
XhmikosR
13c9eb92fb Simplify license.html. 
Remove the custom `replace` filter and use `markdownify` instead.
 2014-01-23 22:27:24 +02:00
XhmikosR
07491fb984 Improve fix from 098369b33f. 
Remove extra newlines which aren't needed.
 2014-01-23 22:27:24 +02:00
XhmikosR
c555b45bd2 Generate sitemap.xml and add robots.txt. 2014-01-23 22:27:00 +02:00
Phil Haack
d799d37492 Merge pull request #180 from XhmikosR/selectivizr 
Selectivizr
 2014-01-23 10:37:48 -08:00
Phil Haack
6db0253e26 Merge pull request #179 from XhmikosR/zeroclipboard 
Update ZeroClipboard to v1.3.0.
 2014-01-23 10:30:15 -08:00