1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-06 03:38:49 +01:00
Commit Graph

1075 Commits

Author SHA1 Message Date
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 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
CamilleM
688abde66c Removing double quotes from names 2013-07-23 17:48:20 +02:00
CamilleM
efa2996385 udpating permalink to unlicense instead of public domain 2013-07-23 17:37:23 +02:00
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
Juan Francisco Cantero Hurtado
289aeb344f Merge pull request #1 from sl4mmy/add-isc-license
Better ISC license
2013-07-19 13:00:02 -07:00
Kent R. Spillner
f1a1981818 Fix template parameter markers in ISC license.
License template parameters are surrounded by square brackets, not
angle brackets.  Drop extension from source: as it's unnecessary.
Add more details to description:.  Add note: and filename:.  Add
private-use and sort permissions.
2013-07-19 21:57:16 +02:00
Ben Lavender
7701177712 Whitespace rules everything around me. 2013-07-19 21:48:58 +02:00
Ben Lavender
e368063006 Document license interpolation 2013-07-19 21:48:58 +02:00
Ben Lavender
97e3bf2867 Fix description on artistic license 2013-07-19 21:48:57 +02:00
Ben Lavender
e2df8c25ee These are actually advertisements to use the gpl, not copyright notices 2013-07-19 21:48:57 +02:00
Ben Lavender
16ded95b40 This is probably more correct 2013-07-19 21:48:57 +02:00
Ben Lavender
36e348b5f0 gplv2 has a link 2013-07-19 21:48:57 +02:00
Ben Lavender
e1821b67ef Don't replace on how fields; no longer needed 2013-07-19 21:48:57 +02:00
Ben Lavender
489c2600a8 These are just parens. 2013-07-19 21:48:57 +02:00
Ben Lavender
0253e52330 Convert angle brackets to square brackets for display 2013-07-19 21:48:56 +02:00
Ben Lavender
86e224bb54 single angle braces for links and curly braces for non-vars 2013-07-19 21:48:56 +02:00
Ben Lavender
fae1d8dfbe Fix inconsistent replace clauses in BSD 3 clause 2013-07-19 21:48:56 +02:00
Ben Lavender
33d7739819 No more interpolating << 2013-07-19 21:48:56 +02:00