1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-05 17:59:37 +02:00
Commit Graph

637 Commits

Author SHA1 Message Date
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
XhmikosR
48f787cc71 Downgrade selectivizr; now it works again for IE 7-8. 2014-01-23 11:08:47 +02:00
XhmikosR
601c8fdf45 Revert "Remove selectivizr-min.js."
This reverts commit b6728c7502.
2014-01-23 11:08:47 +02:00
XhmikosR
280d578703 Revert "Work around issues with old IE."
This reverts commit e6df569ad0.

Conflicts:
	index.html
2014-01-23 11:08:47 +02:00
XhmikosR
5e3ffdfa9e Update ZeroClipboard to v1.3.0. 2014-01-23 10:11:21 +02:00
Ben Balter
89f2242a08 Merge pull request #176 from penibelst/markdownify-titles
Make sure titles are in smarty pants
2014-01-06 10:55:32 -08:00
Ben Balter
6e9aab4c35 ignore .bundle 2014-01-06 13:38:13 -05:00
Ben Balter
8d6c3f8482 dat 💎 bump 2014-01-06 13:37:27 -05:00
Ben Balter
c7e38b846f Merge pull request #167 from github/bump-ffi
Remove FFI version lock and bump version
2014-01-05 20:20:39 -08:00
Anatol Broder
098369b33f Make sure titles are in smarty pants 2014-01-03 19:34:51 +01:00
Phil Haack
94d8158d09 Merge pull request #173 from penibelst/curly-apostrophes
Fix apostrophes
2013-12-30 18:32:08 -08:00
Anatol Broder
26bb900113 Fix apostrophes 2013-12-28 14:01:22 +01:00
Aidan Feldman
6504fb7cfd remove ffi version lock and bump version
per
880ec82d3c (commitcomment-4891173)
2013-12-18 11:57:44 -05:00
Aidan Feldman
66538ff7ef Merge pull request #166 from github/proofer-ignore
Don't ignore all '#' URLs when running HTML::Proofer
2013-12-18 08:48:49 -08:00
Aidan Feldman
7cb10e1872 Merge pull request #165 from github/upgrade-gems
Upgrade gems
2013-12-18 00:45:35 -08:00
Aidan Feldman
4ac4a1edb4 Merge pull request #164 from github/sort-licenses
Attempt to sort licenses in list
2013-12-18 00:42:05 -08:00
Aidan Feldman
49e50f6390 Don't ignore all '#' URLs when running HTML::Proofer
Explicitly ignore the clipboard button from proofing, which was why the
:href_ignore was there in the first place.  Per
https://github.com/github/choosealicense.com/pull/104/files#r7311111.
2013-12-18 03:28:01 -05:00
Aidan Feldman
36afbcd750 upgrade gems 2013-12-18 03:12:31 -05:00
Aidan Feldman
67e88a39e3 attempt to sort licenses in list 2013-12-18 02:48:49 -05:00