Ben Balter
6fcdc068ca
Merge pull request #16 from dpen2000/patch-1
...
Remove include-license (covered by include-copyright)
2013-07-15 11:55:42 -07:00
dpen2000
73c1efe44f
Remove include-license (covered by include-copyright)
2013-07-15 19:51:45 +01:00
Ben Balter
c863d3dcf8
Use proper AGPL source link
2013-07-15 14:30:59 -04:00
Ben Balter
3731105442
Merge pull request #11 from rahearn/fix-affero-text
...
Use Affero GPL text instead of GPLv3
2013-07-15 11:30:09 -07:00
Phil Haack
36d34ba6c1
Merge pull request #14 from github/no-license-permalink
...
Licenses/ should link to the no-license license, not to /no-license
2013-07-15 11:17:04 -07:00
Ben Balter
9543057018
license/ should link to the "no-license" license, not to /no-license
2013-07-15 14:10:31 -04:00
Phil Haack
ded4b46d89
Merge pull request #9 from ajepst/patch-1
...
Add license name to MIT license
2013-07-15 10:53:23 -07:00
Phil Haack
aeff2592ee
Merge pull request #12 from github/fixup-implicit-patent-grant-language
...
Remove implicit patent grant claim
2013-07-15 10:50:33 -07:00
Phil Haack
3c1206290f
Remove implicit patent grant claim
...
We need to clarify this better later. But for now, let's keep the claim simple here.
2013-07-15 10:48:55 -07:00
Ryan Ahearn
ba0ae09a11
Use Affero GPL text instead of GPLv3
2013-07-15 13:38:07 -04:00
Anne Epstein
10d5b7a27f
Add license name to MIT license
...
It's very helpful/timesaving to people considering making use of a project for the license text to have the title, so they don't have to do a search to confirm what the license is. Therefore, the portion of the MIT license that gets copied to clipboard should have the license title.
2013-07-15 12:30:15 -05:00
Phil Haack
e3088dd314
Merge pull request #7 from bxt/patch-1
...
Replace "adds a restriction restricting" with "further restricts" for better wording
2013-07-15 10:09:59 -07:00
Bernhard Häussner
e8bfd3aa92
Fix typo
2013-07-15 19:07:12 +02:00
Bernhard Häussner
30cd2830f8
Fix #6 by replacing "adds a restriction restricting" with "further restrics"
2013-07-15 19:04:24 +02:00
Coby Chapple
1ca2e170fc
Merge pull request #4 from pborreli/patch-1
...
Fixed html typo
2013-07-15 09:52:08 -07:00
Pascal Borreli
991ab2e225
Fixed html typo
2013-07-15 17:49:49 +01:00
Ben Balter
cefdb6ace0
Merge pull request #2 from github/analytics
...
Add google analytics tracking code to footer
2013-07-15 09:42:01 -07:00
Ben Balter
5411a48f8f
add google analytics tracking code to footer
2013-07-15 12:40:40 -04:00
Ben Balter
565d35107e
Merge pull request #98 from github/tos
...
Custom Terms of Service
2013-07-15 06:35:13 -07:00
Julio Avalos
86dc869e81
Drafted a One-off TOS for Choosealicense.com
2013-07-14 23:14:31 -07:00
Phil Haack
c8cfd6b3b2
Merge pull request #107 from github/roll-out-the-redcarpet
...
Use Redcarpet to process markdown
2013-07-14 22:00:12 -07:00
Ben Balter
e586d8c9ea
use redcarpet to process markdown
2013-07-14 12:56:48 -04:00
Phil Haack
e8b7728f9d
Merge pull request #106 from github/better-bootstrapping
...
Use local version of coffee-script
2013-07-14 09:43:46 -07:00
Phil Haack
2f64cdc6a0
Merge pull request #104 from github/footer-tweak
...
Add the Inc to be consistent with other sites
2013-07-14 09:42:15 -07:00
Ben Balter
f60943e037
use local version of coffee-script, fixes #100 better
2013-07-14 12:13:53 -04:00
Ben Balter
b7975263a8
Merge pull request #105 from github/jdennes-absolute-permalinks
...
Use Absolute Permalinks
2013-07-14 08:55:57 -07:00
James Dennes
9dbb60c5c6
Use Absolute Permalinks
...
This removes the deprecation warning about absolute permalinks. Absolute Permalinks will be the default as of Jekyll v1.1: http://jekyllrb.com/docs/upgrading/
2013-07-14 15:32:06 +02:00
Haacked
c1cdc47d6b
Add the Inc to be consistent with other sites
2013-07-13 19:58:17 -07:00
Phil Haack
6dd1d34419
Merge pull request #102 from github/disambiguate-we
...
Disambiguate who "we" is in `about.md`
2013-07-13 19:27:47 -07:00
Phil Haack
6da00c2d70
Merge pull request #101 from github/footer-branding
...
Add _____ with <3 to footer
2013-07-13 19:27:28 -07:00
Ben Balter
f44856b904
add rendered with <3 to footer
2013-07-13 19:07:43 -04:00
Ben Balter
7d4b2e8903
s/we want/GitHub wants/ in about.md, props @haacked
2013-07-13 19:01:23 -04:00
Ben Balter
e8bc30316d
rebuild app.js with latest coffestscript
2013-07-13 18:59:32 -04:00
Ben Balter
f74a52ddb7
install coffee-script globally, fixes #100 , props @cameronmcefee
2013-07-13 18:48:08 -04:00
Phil Haack
1bc439a3c8
Merge pull request #99 from github/seo
...
Add license description as meta tag in header
2013-07-13 14:03:36 -07:00
Ben Balter
95cc2e87b7
add description to index.html
2013-07-13 16:42:40 -04:00
Ben Balter
9721cb5f8e
dat seo
2013-07-13 16:40:43 -04:00
Ben Balter
b893180ebe
remote title from tos body
2013-07-13 16:30:29 -04:00
Phil Haack
906b750e23
Merge pull request #96 from github/js-tweaks
...
Javascript Improvements
2013-07-13 13:28:46 -07:00
Phil Haack
947c2541f9
Merge pull request #97 from github/even-dryer-templating
...
Even DRYer templating
2013-07-13 13:28:25 -07:00
Ben Balter
5f20373fd9
placeholder ToS file
2013-07-13 15:48:28 -04:00
Ben Balter
25569a5ec1
move breadcrumbs to include
2013-07-13 15:46:13 -04:00
Ben Balter
12f4407bdc
Even dryer templates
...
* consolidate breadcrumb logic
* move h1 to header.html
* remove #home div from index.html
2013-07-13 15:42:46 -04:00
Ben Balter
090d1467d4
add coffeescrpt to scripts
2013-07-13 15:25:55 -04:00
Ben Balter
58c7a4ee1d
javascript tweaks
2013-07-13 15:18:57 -04:00
Phil Haack
59bd13024d
Merge pull request #92 from github/better-templating
...
DRY up templating
2013-07-13 09:55:41 -07:00
Phil Haack
9e1310a519
Merge pull request #93 from github/no-license-md
...
Convert no-license.html to markdown
2013-07-13 09:53:28 -07:00
Ben Balter
e372c13f7d
convert no-license.html to markdown
2013-07-13 11:09:36 -04:00
Ben Balter
eb65fab847
Resolve merge confict with #91
2013-07-13 10:51:38 -04:00
Ben Balter
b32317358b
Merge branch 'jdennes-more-consistent-breadcrumb-nav' of https://github.com/github/choosealicense.com into better-templating
2013-07-13 10:50:03 -04:00
