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

72 Commits

Author SHA1 Message Date
Mike Linksvayer
6df14f2d42 Merge branch 'content-B' of https://github.com/afeld/choosealicense.com into food-licenses 2016-02-25 18:18:41 -08:00
Mike Linksvayer
db18b5dfe6 apache version, GNU *gpl naming, in part via #335 2016-02-16 09:29:18 -08:00
Brandon Keepers
6da34f0825 Use Android instead of Docker
Reasoning: it is a mass consumer brand that is likely to be better known than Apache
2016-02-01 19:48:02 +01:00
Brandon Keepers
3227e22d89 Revert changes to GPL text
This should be iterated on in another PR
2016-02-01 19:45:01 +01:00
Brandon Keepers
abe74941dc Update examples
- add a 3rd example (.NET Core) for MIT
- replace SVN & NuGet with more more modern and well-known examples
(Swift, Docker) for Apache:
- Add a GPLv3 project to examples.
2016-01-31 19:54:59 +01:00
Brandon Keepers
ba251b175a Revert "Update examples"
This reverts commit 49cf1471f7.
2016-01-31 19:54:01 +01:00
Brandon Keepers
49cf1471f7 Update examples
- add a 3rd example (.NET Core) for MIT
- replace SVN & NuGet with more more modern and well-known examples
(Swift, Docker) for Apache:
- Add a GPLv3 project to examples.
2016-01-31 19:53:09 +01:00
Michal Nazarewicz
1422ea3386 Prefer (L)GPL 3.0 to 2.x.
The GPL v3 is an improvement over v2 fixing several issues and
increasing compatibility with other free software licenses.  As such
there is no reason to feature v2 prominently rather than v3.  See
http://www.gnu.org/licenses/rms-why-gplv3.en.html for more rationale.
2015-11-17 16:00:02 +01:00
Aidan Feldman
b24913bb5e Merge remote-tracking branch 'origin/gh-pages' into content-B 2015-11-02 12:35:14 -05:00
Ben Balter
34368e5c32 add fallback description 2015-10-23 17:58:46 -04:00
Ben Balter
4f54fc5c07 add seo include 2015-10-23 17:50:25 -04:00
Anatol Broder
deb2301f48 Use curly apostrophes 2015-01-10 14:20:22 +01:00
Ben Balter
0f652f971e link directly to apache and gpl from homepage, fixes #212 2014-09-05 11:47:43 -04:00
Phil Haack
24e9effec1 Merge pull request #182 from XhmikosR/sitemap
Generate sitemap.xml and add robots.txt.
2014-01-24 09:16:26 -08:00
XhmikosR
6211c56b68 index.html: specify permalink.
This way we don't get `http://choosealicense.com/index.html` in sitemap.
2014-01-24 08:25:40 +02:00
XhmikosR
d40409be96 Revert 26bb900113.
Jekyll already takes care of those.
2014-01-23 22:27:31 +02:00
XhmikosR
280d578703 Revert "Work around issues with old IE."
This reverts commit e6df569ad0.

Conflicts:
	index.html
2014-01-23 11:08:47 +02:00
Aidan Feldman
a73e18bcd3 rename 'content' page to 'non-code' 2014-01-12 23:11:18 -05:00
Aidan Feldman
b1275252c5 add page around licensing content 2014-01-12 23:05:58 -05:00
Anatol Broder
26bb900113 Fix apostrophes 2013-12-28 14:01:22 +01:00
XhmikosR
e6df569ad0 Work around issues with old IE. 2013-12-16 18:45:28 +02:00
XhmikosR
d86fc76265 Use a CSS sprite for the homepage images.
-2 http requests, -1KB.
2013-12-15 10:11:52 +02:00
XhmikosR
2732cf40c0 Rename folders to the shorter and more standard "img" and "js". 2013-12-14 12:44:29 +02:00
XhmikosR
dc4309bd02 Rename clearfix class. 2013-12-10 09:04:20 +02:00
XhmikosR
c1c291b379 Use double quotes consistently. 2013-10-30 20:39:55 +02:00
Aidan Feldman
b5ff5db785 tweaks to make html-proofing pass 2013-10-23 00:20:44 -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
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
5126e72b4a add line re: non-code projects 2013-09-14 00:57:53 -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
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
Coby Chapple
e794054abf prevent widows in the license example project paragraphs 2013-07-16 10:34:38 +01: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
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
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
Pascal Borreli
991ab2e225 Fixed html typo 2013-07-15 17:49:49 +01:00
Ben Balter
95cc2e87b7 add description to index.html 2013-07-13 16:42:40 -04:00
Ben Balter
12f4407bdc Even dryer templates
* consolidate breadcrumb logic
* move h1 to header.html
* remove #home div from index.html
2013-07-13 15:42:46 -04:00
Ben Balter
b32317358b Merge branch 'jdennes-more-consistent-breadcrumb-nav' of https://github.com/github/choosealicense.com into better-templating 2013-07-13 10:50:03 -04:00
Ben Balter
20fd8b4fb2 move header and footer to includes 2013-07-13 10:38:53 -04:00
Haacked
70aaba7ba0 Tweaks per content review 2013-07-10 14:01:00 -07:00
Haacked
7295849a88 homepage text tweaking per legal review 2013-07-10 10:59:35 -07:00
Jason Long
2ed47b6bde cleaned up alternative licenses blurb 2013-06-11 12:39:22 -04:00