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

174 Commits

Author SHA1 Message Date
Julio Avalos
86dc869e81 Drafted a One-off TOS for Choosealicense.com 2013-07-14 23:14:31 -07:00
Ben Balter
b893180ebe remote title from tos body 2013-07-13 16:30:29 -04:00
Ben Balter
5f20373fd9 placeholder ToS file 2013-07-13 15:48:28 -04:00
Phil Haack
59bd13024d Merge pull request #92 from github/better-templating
DRY up templating
2013-07-13 09:55:41 -07:00
Phil Haack
9e1310a519 Merge pull request #93 from github/no-license-md
Convert no-license.html to markdown
2013-07-13 09:53:28 -07:00
Ben Balter
e372c13f7d convert no-license.html to markdown 2013-07-13 11:09:36 -04:00
Ben Balter
eb65fab847 Resolve merge confict with #91 2013-07-13 10:51:38 -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
f645597b56 hide_breadrumbs support 2013-07-13 10:44:09 -04:00
Ben Balter
20fd8b4fb2 move header and footer to includes 2013-07-13 10:38:53 -04:00
James Dennes
8ae085df65 Cleaned up breadcrumbs.
The breadcrumbs navigation is now in the default template. The removes some duplication. The only page it shouldn't be shown on is the home page.
2013-07-13 16:38:01 +02:00
Ben Balter
ffb1c83655 Merge pull request #89 from github/fix-relative-links
fix #88 - broken relative links
2013-07-13 06:52:07 -07:00
James Dennes
380731aaec Added Home link to /licenses and /no-license.
Previously there was no way of navigating back to the main page from /licenses and /no-licenses.
2013-07-13 12:01:06 +02:00
Patrick Reynolds
2270711771 fix #88 - broken relative links 2013-07-13 01:16:15 -05:00
Haacked
98f7a3c730 Fix link in public domain license 2013-07-12 16:18:48 -07:00
Phil Haack
67c03f75c1 Merge pull request #82 from github/license-categories
License category updates
2013-07-12 15:03:16 -07:00
Haacked
fb92ca1707 Removed warranty category 2013-07-12 15:01:08 -07:00
Haacked
ba67cba0ea Cosmetic cleanup and remove unused category 2013-07-12 14:58:56 -07:00
Haacked
3b83a075e1 Change liability label 2013-07-12 14:58:56 -07:00
Phil Haack
23f2cce6e8 Fixed trademark-use description. 2013-07-12 14:58:56 -07:00
Phil Haack
d9617c50c8 Removed "only" per hoolio suggestion 2013-07-12 14:58:56 -07:00
Phil Haack
596cfa1a32 Add the word "notice" to description 2013-07-12 14:58:56 -07:00
Ben Balter
d2436b76e2 s/proprietary/non-open-source/ 2013-07-12 14:58:56 -07:00
Haacked
dca341d472 Making things less lawyery 2013-07-12 14:58:56 -07:00
Haacked
300f796aa9 Add no-liability to public domain 2013-07-12 14:58:56 -07:00
Haacked
f0f4402f35 Added patent-grant category 2013-07-12 14:58:56 -07:00
Haacked
2f1bae8a8f Clarified trademark-use description
Also removed it from BSD as the license text doesn't explicitly mention
trademork.
2013-07-12 14:58:56 -07:00
Haacked
c4c48d498c Change nonstatic to library usage
Per review, we should call it library usage. Also pointed out that LGPL
does require disclosing source.
2013-07-12 14:58:56 -07:00
Haacked
927154fc19 Fixup description of disclose-source
Added a call-out about LGPL
2013-07-12 14:58:56 -07:00
Haacked
2c0cda0e53 Fixup GPL description 2013-07-12 14:58:56 -07:00
Haacked
3c29d5da87 Replace copyright and license with single category 2013-07-12 14:58:56 -07:00
Phil Haack
8ae1c78757 Merge pull request #85 from github/mit-bsd-sync
Clarify bsd 2 clause
2013-07-12 14:58:28 -07:00
Phil Haack
e3544ff056 Merge pull request #81 from github/public-domain
Add public domain license
2013-07-12 14:51:52 -07:00
Haacked
fd1ea0b72d Improve public domain description 2013-07-12 14:51:14 -07:00
Phil Haack
e43eded157 Merge pull request #80 from github/homepage-changes
homepage text tweaking per legal review
2013-07-12 14:48:41 -07:00
Phil Haack
87c7ea085e Merge pull request #83 from github/about-page-tweaks
Tried to tone down language about the choices
2013-07-12 14:48:17 -07:00
Ben Balter
c90a6a615c clarify bsd 2 clause 2013-07-12 14:58:06 -04:00
Haacked
70aaba7ba0 Tweaks per content review 2013-07-10 14:01:00 -07:00
Haacked
3ae89614b1 Tried to tone down language about the choices
Rather than say these are the ones you only need to choose, we just say
most projects will be fine with one of these choices.
2013-07-10 13:55:10 -07:00
Ben Balter
47a12aca16 Add comma 2013-07-10 15:00:18 -04:00
Haacked
776046f049 Add public domain license 2013-07-10 11:20:40 -07:00
Haacked
7295849a88 homepage text tweaking per legal review 2013-07-10 10:59:35 -07:00
Phil Haack
048c363207 Merge pull request #79 from github/jekyll-bump
Bump jekyll to 1.0.3. to stay in line with Pages
2013-07-10 10:35:47 -07:00
Phil Haack
8184f43919 Merge pull request #78 from github/footer-link
Link about in footer of license template
2013-07-10 10:35:30 -07:00
Ben Balter
678107b1e6 bump jekyll to 1.0.3. to stay in line with pages 2013-07-10 13:13:50 -04:00
Ben Balter
32c3bf61f8 link about in footer of license template 2013-07-10 13:03:11 -04:00
Phil Haack
2bc204f279 Merge pull request #75 from github/readme-cleanup
Readme cleanup
2013-06-16 09:36:51 -07:00
Phil Haack
0eac728f77 Merge pull request #76 from github/code-callout
Add link to source code
2013-06-16 09:35:56 -07:00
Ben Balter
130dcaa558 add link to source code 2013-06-16 11:03:31 -04:00
Ben Balter
d7ca8a2c19 readme cleanup 2013-06-16 10:57:21 -04:00