1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-05 11:18:50 +01:00
Commit Graph

271 Commits

Author SHA1 Message Date
CamilleM
ea1de63fa6 Fixing CTKI pb 2013-07-23 15:37:43 +02:00
CamilleM
dc525aa42e solving merge conflict 2013-07-23 15:31:12 +02:00
CamilleM
e02ec17a95 Shorter license names 2013-07-23 15:28:27 +02:00
CamilleM
d17d053844 Shorter license names 2013-07-23 15:05:26 +02:00
CamilleM
0161a3d75d getting unlicense text into CC0 file for merge 2013-07-23 13:37:38 +02:00
CamilleM
bde9ce780d Updating license filenames, titles and permalinks to match SPDX standard 2013-07-22 11:25:33 +02:00
CamilleM
9f01c1a41b Updating licenses filenames, titles and permalinks to follow SPDX standard 2013-07-22 11:21:50 +02:00
Ben Lavender
1cdd11eb01 Whitespace rules everything around me. 2013-07-18 11:08:24 -05:00
Phil Haack
a488a07e6b Merge pull request #55 from bhuga/rework-brackets
Rework brackets
2013-07-18 09:01:16 -07:00
Ben Lavender
67287e8b61 Document license interpolation 2013-07-18 10:43:08 -05:00
Ben Lavender
14bd7cbaed Fix description on artistic license 2013-07-17 17:51:33 -05:00
Ben Lavender
7e7e54d3df These are actually advertisements to use the gpl, not copyright notices 2013-07-17 17:50:31 -05:00
Ben Lavender
61ed4a518c This is probably more correct 2013-07-17 17:48:22 -05:00
Ben Lavender
dc31ddcbe8 gplv2 has a link 2013-07-17 17:43:01 -05:00
Ben Lavender
b080b5e2fe Don't replace on how fields; no longer needed 2013-07-17 17:30:55 -05:00
Ben Lavender
871eee21de These are just parens. 2013-07-17 15:33:39 -05:00
Ben Lavender
8b2afbd889 Convert angle brackets to square brackets for display 2013-07-17 15:32:34 -05:00
Ben Lavender
4e2fd06748 single angle braces for links and curly braces for non-vars 2013-07-17 15:32:20 -05:00
Phil Haack
2e69cfbbd1 Merge pull request #53 from github/fix-links
Link cleanup
2013-07-17 10:21:18 -07:00
Ben Lavender
7ecc0c06d9 Fix inconsistent replace clauses in BSD 3 clause 2013-07-17 12:00:40 -05:00
Ben Lavender
babcaa2a18 No more interpolating << 2013-07-17 11:57:57 -05:00
Ben Lavender
88e4101ce3 Link the unlicense and specificity about waiving 2013-07-17 11:41:30 -05:00
Ben Lavender
ad66f7d405 Unlicense is called UNLICENSE 2013-07-17 11:39:25 -05:00
Ben Lavender
e0ad6dee44 Fix << >> and < > and { } urls 2013-07-17 11:38:47 -05:00
Phil Haack
37f77b1ba4 hwhoops! Quick fix. 2013-07-16 17:25:59 -07:00
Phil Haack
272b5d6b39 Merge pull request #38 from bhuga/unlicense
Use the Unlicense instead of CC0 to represent the public domain
2013-07-16 17:13:57 -07:00
Phil Haack
b9560ccabc Merge pull request #26 from elcuervo/copy_to_clipboard_without_flash
Adds a way to copy the license without using ZeroClipboard
2013-07-16 17:11:01 -07:00
Phil Haack
9084caac09 Merge pull request #49 from github/betta-contrast
Darker text for better contrast - fixes #37
2013-07-16 12:17:42 -07:00
Jason Long
7bbf5d5230 darkened text for better contrast 2013-07-16 14:24:45 -04:00
Ben Lavender
3250493b77 Words again 2013-07-16 11:33:43 -05:00
Ben Balter
cdffcdbb1f Merge pull request #47 from github/api
Expose license data as an api
2013-07-16 09:20:10 -07:00
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