1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00

Commit Graph

  • c026865ee8 Merge 991ab2e2257dd51ce1597c7c6fb64d8be3af4614 into cefdb6ace09f6203af10f2a5b6a4438a8f362134 Pascal Borreli 2013-07-15 09:50:11 -07:00
  • 991ab2e225 Fixed html typo Pascal Borreli 2013-07-15 17:49:49 +01:00
  • cefdb6ace0 Merge pull request #2 from github/analytics Ben Balter 2013-07-15 09:42:01 -07:00
  • e909a4d726 Merge 5411a48f8f8b918a0b557f4fcab6bd1aa331d424 into 565d35107eb4738b75446dd25fc966f0594a2af4 Ben Balter 2013-07-15 09:41:16 -07:00
  • 5411a48f8f add google analytics tracking code to footer Ben Balter 2013-07-15 12:40:40 -04:00
  • 565d35107e Merge pull request #98 from github/tos Ben Balter 2013-07-15 06:35:13 -07:00
  • 86dc869e81 Drafted a One-off TOS for Choosealicense.com Julio Avalos 2013-07-14 23:14:31 -07:00
  • c8cfd6b3b2 Merge pull request #107 from github/roll-out-the-redcarpet Phil Haack 2013-07-14 22:00:12 -07:00
  • e586d8c9ea use redcarpet to process markdown Ben Balter 2013-07-14 12:56:48 -04:00
  • e8b7728f9d Merge pull request #106 from github/better-bootstrapping Phil Haack 2013-07-14 09:43:46 -07:00
  • 2f64cdc6a0 Merge pull request #104 from github/footer-tweak Phil Haack 2013-07-14 09:42:15 -07:00
  • f60943e037 use local version of coffee-script, fixes #100 better Ben Balter 2013-07-14 12:13:53 -04:00
  • b7975263a8 Merge pull request #105 from github/jdennes-absolute-permalinks Ben Balter 2013-07-14 08:55:57 -07:00
  • 9dbb60c5c6 Use Absolute Permalinks This removes the deprecation warning about absolute permalinks. Absolute Permalinks will be the default as of Jekyll v1.1: http://jekyllrb.com/docs/upgrading/ James Dennes 2013-07-14 15:32:06 +02:00
  • c1cdc47d6b Add the Inc to be consistent with other sites Haacked 2013-07-13 19:58:17 -07:00
  • 6dd1d34419 Merge pull request #102 from github/disambiguate-we Phil Haack 2013-07-13 19:27:47 -07:00
  • 6da00c2d70 Merge pull request #101 from github/footer-branding Phil Haack 2013-07-13 19:27:28 -07:00
  • f44856b904 add rendered with <3 to footer Ben Balter 2013-07-13 19:07:43 -04:00
  • 7d4b2e8903 s/we want/GitHub wants/ in about.md, props @haacked Ben Balter 2013-07-13 19:01:23 -04:00
  • e8bc30316d rebuild app.js with latest coffestscript Ben Balter 2013-07-13 18:59:32 -04:00
  • f74a52ddb7 install coffee-script globally, fixes #100, props @cameronmcefee Ben Balter 2013-07-13 18:48:08 -04:00
  • 1bc439a3c8 Merge pull request #99 from github/seo Phil Haack 2013-07-13 14:03:36 -07:00
  • 95cc2e87b7 add description to index.html Ben Balter 2013-07-13 16:42:40 -04:00
  • 9721cb5f8e dat seo Ben Balter 2013-07-13 16:40:43 -04:00
  • b893180ebe remote title from tos body Ben Balter 2013-07-13 16:30:29 -04:00
  • 906b750e23 Merge pull request #96 from github/js-tweaks Phil Haack 2013-07-13 13:28:46 -07:00
  • 947c2541f9 Merge pull request #97 from github/even-dryer-templating Phil Haack 2013-07-13 13:28:25 -07:00
  • 5f20373fd9 placeholder ToS file Ben Balter 2013-07-13 15:48:28 -04:00
  • 25569a5ec1 move breadcrumbs to include Ben Balter 2013-07-13 15:46:13 -04:00
  • 12f4407bdc Even dryer templates Ben Balter 2013-07-13 15:42:46 -04:00
  • 090d1467d4 add coffeescrpt to scripts Ben Balter 2013-07-13 15:25:55 -04:00
  • 58c7a4ee1d javascript tweaks Ben Balter 2013-07-13 15:18:57 -04:00
  • 59bd13024d Merge pull request #92 from github/better-templating Phil Haack 2013-07-13 09:55:41 -07:00
  • 9e1310a519 Merge pull request #93 from github/no-license-md Phil Haack 2013-07-13 09:53:28 -07:00
  • e372c13f7d convert no-license.html to markdown Ben Balter 2013-07-13 11:09:36 -04:00
  • eb65fab847 Resolve merge confict with #91 Ben Balter 2013-07-13 10:51:38 -04:00
  • b32317358b Merge branch 'jdennes-more-consistent-breadcrumb-nav' of https://github.com/github/choosealicense.com into better-templating Ben Balter 2013-07-13 10:50:03 -04:00
  • f645597b56 hide_breadrumbs support Ben Balter 2013-07-13 10:44:09 -04:00
  • 20fd8b4fb2 move header and footer to includes Ben Balter 2013-07-13 10:38:53 -04:00
  • 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. James Dennes 2013-07-13 16:38:01 +02:00
  • ffb1c83655 Merge pull request #89 from github/fix-relative-links Ben Balter 2013-07-13 06:52:07 -07:00
  • 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. James Dennes 2013-07-13 12:01:06 +02:00
  • 2270711771 fix #88 - broken relative links Patrick Reynolds 2013-07-13 01:16:08 -05:00
  • 98f7a3c730 Fix link in public domain license Haacked 2013-07-12 16:18:48 -07:00
  • 67c03f75c1 Merge pull request #82 from github/license-categories Phil Haack 2013-07-12 15:03:16 -07:00
  • fb92ca1707 Removed warranty category Haacked 2013-07-12 15:01:08 -07:00
  • ba67cba0ea Cosmetic cleanup and remove unused category Haacked 2013-07-12 14:47:31 -07:00
  • 3b83a075e1 Change liability label Haacked 2013-07-12 14:47:18 -07:00
  • 23f2cce6e8 Fixed trademark-use description. Phil Haack 2013-07-12 14:39:23 -07:00
  • d9617c50c8 Removed "only" per hoolio suggestion Phil Haack 2013-07-12 14:37:11 -07:00
  • 596cfa1a32 Add the word "notice" to description Phil Haack 2013-07-12 14:35:35 -07:00
  • d2436b76e2 s/proprietary/non-open-source/ Ben Balter 2013-07-11 08:42:32 -04:00
  • dca341d472 Making things less lawyery Haacked 2013-07-10 14:04:55 -07:00
  • 300f796aa9 Add no-liability to public domain Haacked 2013-07-10 12:03:22 -07:00
  • f0f4402f35 Added patent-grant category Haacked 2013-07-10 12:03:09 -07:00
  • 2f1bae8a8f Clarified trademark-use description Haacked 2013-07-10 11:58:01 -07:00
  • c4c48d498c Change nonstatic to library usage Haacked 2013-07-10 11:55:57 -07:00
  • 927154fc19 Fixup description of disclose-source Haacked 2013-07-10 11:55:23 -07:00
  • 2c0cda0e53 Fixup GPL description Haacked 2013-07-10 11:48:00 -07:00
  • 3c29d5da87 Replace copyright and license with single category Haacked 2013-07-10 11:32:22 -07:00
  • 8ae1c78757 Merge pull request #85 from github/mit-bsd-sync Phil Haack 2013-07-12 14:58:28 -07:00
  • e3544ff056 Merge pull request #81 from github/public-domain Phil Haack 2013-07-12 14:51:52 -07:00
  • fd1ea0b72d Improve public domain description Haacked 2013-07-10 14:03:18 -07:00
  • e43eded157 Merge pull request #80 from github/homepage-changes Phil Haack 2013-07-12 14:48:41 -07:00
  • 87c7ea085e Merge pull request #83 from github/about-page-tweaks Phil Haack 2013-07-12 14:48:17 -07:00
  • c90a6a615c clarify bsd 2 clause Ben Balter 2013-07-12 14:58:06 -04:00
  • 70aaba7ba0 Tweaks per content review Haacked 2013-07-10 14:01:00 -07:00
  • 3ae89614b1 Tried to tone down language about the choices Haacked 2013-07-10 13:55:10 -07:00
  • 47a12aca16 Add comma Ben Balter 2013-07-10 15:00:18 -04:00
  • 776046f049 Add public domain license Haacked 2013-07-10 11:20:40 -07:00
  • 7295849a88 homepage text tweaking per legal review Haacked 2013-07-10 10:59:35 -07:00
  • 048c363207 Merge pull request #79 from github/jekyll-bump Phil Haack 2013-07-10 10:35:47 -07:00
  • 8184f43919 Merge pull request #78 from github/footer-link Phil Haack 2013-07-10 10:35:30 -07:00
  • 678107b1e6 bump jekyll to 1.0.3. to stay in line with pages Ben Balter 2013-07-10 13:13:50 -04:00
  • 32c3bf61f8 link about in footer of license template Ben Balter 2013-07-10 13:03:11 -04:00
  • 2bc204f279 Merge pull request #75 from github/readme-cleanup Phil Haack 2013-06-16 09:36:51 -07:00
  • 0eac728f77 Merge pull request #76 from github/code-callout Phil Haack 2013-06-16 09:35:56 -07:00
  • 130dcaa558 add link to source code Ben Balter 2013-06-16 11:03:31 -04:00
  • d7ca8a2c19 readme cleanup Ben Balter 2013-06-16 10:57:21 -04:00
  • 48e67fbaab Merge pull request #73 from github/howto-escaping Phil Haack 2013-06-15 12:30:30 -07:00
  • e265b4b988 Merge pull request #72 from github/license-relative-links Phil Haack 2013-06-15 12:29:49 -07:00
  • 13750495a1 Merge pull request #71 from github/bsd-license-text Phil Haack 2013-06-15 12:29:14 -07:00
  • 5b0a1eb033 licenses/bsd: use actual 2-clause form Jeff King 2013-06-15 04:45:37 -04:00
  • 3434956294 licenses: pre-format bsd license texts Jeff King 2013-06-15 04:33:30 -04:00
  • 9ec596780f licenses: make all permalinks relative Jeff King 2013-06-15 04:21:04 -04:00
  • 62066749b5 sidebar: convert <</>> into brackets in page.how Jeff King 2013-06-15 04:13:13 -04:00
  • 244f14f93c fix up one more s/PERL/Perl/ instance Jeff King 2013-06-15 04:12:01 -04:00
  • 3298755706 fix capitalization of PERL/artistic license Jeff King 2013-06-15 04:56:01 -03:00
  • d6d1df171b Merge pull request #69 from github/meta-license Phil Haack 2013-06-12 19:49:38 -07:00
  • f8f6335264 add license, fixes #68 Ben Balter 2013-06-12 22:22:50 -04:00
  • 42e9887c9e Merge pull request #64 from github/no-license-no-parents Phil Haack 2013-06-11 16:02:00 -07:00
  • 15aa0e99ac Merge pull request #66 from github/escape-variables Phil Haack 2013-06-11 16:01:13 -07:00
  • 85c01c1d7f replace double < and > with [ and ] Ben Balter 2013-06-11 18:51:26 -04:00
  • 80810fd65e Merge pull request #67 from github/no-license-prettifying Phil Haack 2013-06-11 15:42:51 -07:00
  • cc1ee73496 Merge pull request #65 from github/tos-link Phil Haack 2013-06-11 15:40:13 -07:00
  • 3fbb75b49e license table cleanup Jason Long 2013-06-11 14:13:00 -04:00
  • 2ed47b6bde cleaned up alternative licenses blurb Jason Long 2013-06-11 12:39:22 -04:00
  • 9bf0d9e8df properly spell the word Modification Ben Balter 2013-06-11 10:51:13 -04:00
  • 1fb31d2314 add negative properties to _config.yml Ben Balter 2013-06-11 10:49:46 -04:00
  • 18e0fb6e2e tighten description to be closer to the others Ben Balter 2013-06-11 10:45:09 -04:00