1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 21:00:10 +01:00

353 Commits

Author SHA1 Message Date
Phil Haack
a5f4538c00 Merge pull request #89 from github/cc
Add FAQ re: non-code projects
2013-09-16 13:03:33 -07:00
Ben Balter
b2892098a0 tighten up index part deux copy 2013-09-16 15:47:27 -04:00
Aidan Feldman
f03c77d9fa separate first and second row of homepage questions 2013-09-16 15:42:21 -04:00
Aidan Feldman
6e91d6b529 change text of second row homepage questions to be consistent with the first 2013-09-16 15:39:10 -04:00
Aidan Feldman
b4e302a73c increase vertical spacing between homepage questions 2013-09-16 15:38:22 -04:00
Aidan Feldman
0177da529a reorder homepage questions 2013-09-16 15:17:53 -04:00
Aidan Feldman
837cb3e1d2 reduce text in the homepage FAQ 2013-09-16 15:17:02 -04:00
Aidan Feldman
a47bbeea43 make the additinal homepage questions side-by-side 2013-09-16 15:16:10 -04:00
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
a0e3974eb3 Added "legal" qualifier to clarify a legal professional is advisable. 2013-08-19 23:55:46 +03: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
2329a74692 More concise Artistic license description. 2013-08-19 16:49:48 +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
enyst
5a201367c4 Add note about the condition on modified versions to the description of Artistic. 2013-08-19 04:41:05 +03:00
enyst
7ed07c572f Artistic license is not copyleft. Fixes #73
Signed-off-by: enyst <engel.nyst@gmail.com>
2013-08-19 04:35:24 +03:00
enyst
daa1ada6bc Rephrase advice to consult a legal professional. Fixes #57 2013-08-18 22:47:53 +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
Jakukyo Friel
86f22c87d6 make notations of no-license more coherent
- make notations of /no-license.md and licenses/no-license.html
  more coherent
- clarify only publishing code on a *public* repo on github grants
  others the right to view and fork your code in
  licenses/no-license.html
2013-07-26 17:46:54 +08:00
Ben Balter
f504b88a90 revert 48261c1c7793720bca8546c55fc407e98e62e642 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
Roland Hieber
3edf479745 BSD licenses: bring back the list bullets 2013-07-19 03:15:18 +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