1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-01 08:03:02 +02:00
Commit Graph

290 Commits

Author SHA1 Message Date
Ben Lavender
18b473fd17 Fix wording a little 2013-07-16 11:19:13 -05:00
Phil Haack
66955456a7 Added oxford comma
Yeah, I just committed straight to master. Fight me. I could not let this affront to grammar continue.
2013-07-16 08:41:22 -07:00
Ben Balter
73def230ea cleanup yaml comment 2013-07-16 11:33:33 -04:00
Phil Haack
364cac4268 Merge pull request #42 from spraints/exclude
Leave out dev things.
2013-07-16 08:30:20 -07:00
Ben Balter
685f1b4de2 expose license data as an api, fixes #40 2013-07-16 11:28:32 -04:00
Matt Burke
dff132393e Leave out dev things. 2013-07-16 08:55:19 -04:00
Coby Chapple
35cbf4ad61 license choosers are a thing now 2013-07-16 11:15:53 +01:00
Coby Chapple
e794054abf prevent widows in the license example project paragraphs 2013-07-16 10:34:38 +01:00
Coby Chapple
e2f1af7c5c Merge pull request #35 from veganstraightedge/gh-pages
Added WordPress to list of GPL repos on homepage.
2013-07-16 02:30:58 -07:00
Ben Lavender
ddfbee3953 Use the unlicense instead of CC0 to represent the public domain 2013-07-16 01:11:04 -05:00
Shane Becker
08fb9e0437 Added WordPress to list of GPL repos on homepage.
WordPress is a very popular, very public facing open source project that uses GPL.
2013-07-15 17:47:32 -07:00
Phil Haack
20cb87c0cd Merge pull request #31 from github/make-consistent
Make consistent with featured change
2013-07-15 14:21:04 -07:00
Haacked
ec8c3e2de4 Make consistent with featured change
We made a change here: fb5546db7f

This should reflect that change.
2013-07-15 14:19:26 -07:00
Ben Balter
cd60c9afac Merge pull request #28 from github/featured-license-fix
Changing GPL license flavor featured on github.com
2013-07-15 13:54:16 -07:00
Haacked
fb5546db7f Changing license featured on github.com
This flag controls which license is featured on github.com.
2013-07-15 13:51:09 -07:00
Ben Balter
51b7f0e401 Merge pull request #27 from github/ci
Use travis for ci to verify builds work before merging
2013-07-15 13:31:08 -07:00
Ben Balter
11f926438e use travis for ci to verify builds work before merging 2013-07-15 16:25:44 -04:00
Bruno Aguirre
60f9ab0ab7 Adds a way to copy the license without using ZeroClipboard
* Selects the license when the browser does not have Flash installed so people
 can easily copy & paste it.
2013-07-15 17:19:31 -03:00
Phil Haack
3443bd014d Merge pull request #23 from dpen2000/patch-1
Strip html from description when displaying in meta tag
2013-07-15 12:59:59 -07:00
Phil Haack
5436862a99 Merge pull request #22 from steko/patch-1
It's about licenses: let's get them right!
2013-07-15 12:56:35 -07:00
Stefano Costa
5291123ad4 It's about licenses: let's het them right!
"Creative Commons 3.0 license" is unclear. The link is correct though.
2013-07-15 21:51:08 +02:00
dpen2000
5c9c18e7c3 Strip html from description when displaying in meta tag 2013-07-15 20:50:09 +01:00
Phil Haack
9fd7cebc33 Merge pull request #19 from dpen2000/patch-3
Update eclipse.txt - include disclose-source
2013-07-15 12:50:02 -07:00
dpen2000
c0e377b4ce Update eclipse.txt - include disclose-source 2013-07-15 19:59:24 +01:00
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