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

288 Commits

Author SHA1 Message Date
Aidan Feldman
be6def2b46 Merge remote-tracking branch 'origin/gh-pages' into cc 2013-09-16 14:35:43 -04:00
Aidan Feldman
a35e09a45b Merge pull request #90 from github/resources
Include list of resources
2013-09-16 11:24:20 -07:00
Aidan Feldman
97a6446420 convert resource list to kramdown syntax 2013-09-16 14:21:19 -04:00
Aidan Feldman
972ae57106 Merge remote-tracking branch 'origin/gh-pages' into resources 2013-09-16 14:12:24 -04:00
Aidan Feldman
27b6b5222d Merge pull request #91 from github/kramdown
Use kramdown to process markdown
2013-09-16 11:10:50 -07:00
Ben Balter
5cb937aa9d use kramdown to process markdown 2013-09-16 14:06:50 -04:00
Ben Balter
a21fe69a2a Merge pull request #88 from github/ruby-version
Upgrade gh-pages gem
2013-09-15 11:30:21 -07:00
Aidan Feldman
08c0635e0a include list of resources 2013-09-14 02:15:12 -04:00
Aidan Feldman
5126e72b4a add line re: non-code projects 2013-09-14 00:57:53 -04:00
Aidan Feldman
678ae0686f upgrade ruby version for travis 2013-09-14 00:42:13 -04:00
Aidan Feldman
319bd3677e upgrade to gh-pages 4 2013-09-14 00:39:58 -04:00
Aidan Feldman
29c9fe142a specify required ruby version 2013-09-14 00:35:25 -04:00
Phil Haack
09c99b4ab4 Merge pull request #79 from engelnyst/gpl
Short description of GPL on homepage
2013-08-27 08:17:57 -07:00
Phil Haack
1050344f92 Merge pull request #81 from pathawks/gh-pages
Compress images
2013-08-20 10:12:11 -07:00
Pat Hawks
d32dc360ea Compress images
Compress images using
[ImageOptim](https://github.com/pornel/ImageOptim) version 1.4.3
2013-08-20 01:34:27 -04:00
enyst
1487e9af50 Shorten first part of GPL description as per benbalter's input.
Remove 'whomever they distribute to'.
2013-08-19 16:56:54 +03:00
enyst
717b93a1a7 Rephrase GPL description to avoid modifications in favor of derivative.
Add the qualifier complete to the source code required.
2013-08-19 05:42:03 +03:00
enyst
1709afacee Update GPL short presentation to convey the requirement some better.
Fixes #66
2013-08-19 05:22:18 +03:00
Ben Balter
7874596585 Merge pull request #76 from github/exclude-vendor
Exclude vendor from Jekyll
2013-08-12 10:22:10 -07:00
Ben Balter
7c6200a2b2 Merge pull request #75 from github/github-pages-gem
Use GitHub Pages Gem
2013-08-12 10:20:39 -07:00
Ben Balter
5a3379cb2a Exclude vendor from Jekyll
This will tell Jekyll not to look at the `vendor` folder, preventing
build errors and allowing CI to pass.
2013-08-12 13:18:50 -04:00
Ben Balter
952aa2d196 🐶 food dat github-pages gem 2013-08-12 11:37:32 -04:00
Ben Balter
f504b88a90 revert 48261c1c77 2013-07-25 13:51:32 -04:00
Mark Imbriaco
48261c1c77 Adding choosealicense.org as well as some www. hostnames. 2013-07-25 12:44:01 -04: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