1
0
mirror of https://github.com/github/choosealicense.com synced 2024-06-28 22:53:04 +02:00
Commit Graph

1837 Commits

Author SHA1 Message Date
Mike Linksvayer
d4edd14487
Merge pull request #907 from bbenno/fix/cc-by-sa-4.0
Fix misplaced blank line in cc-by-sa-4.0
2021-11-30 07:14:32 -08:00
Benno Bielmeier
0375fbda07
Fix misplaced blank line in cc-by-sa-4.0
In order to preserver consistency, the blank line should go after the
enumeration item, not within.
2021-11-30 13:38:30 +01:00
Mike Linksvayer
67fcf4ae20
Merge pull request #875 from friederbluemle/lowercase-npm
Lowercase npm
2021-10-26 12:54:27 -07:00
Mike Linksvayer
96017b3035
Update example use URL for UPL-1.0
File was renamed.
2021-10-26 12:53:24 -07:00
Frieder Bluemle
779a921a56
Lowercase npm 2021-10-26 11:46:28 -07:00
nytpu
da312bcaa9 add ohwr.org to license_meta_spec.rb 2021-08-24 10:05:25 -06:00
nytpu
8d4b35ef94 fix license wrapping 2021-08-24 09:55:11 -06:00
nytpu
9afc07e19c Fix typos and expand reasoning in non-software 2021-08-24 08:43:52 -06:00
nytpu
6e0063e56c Add Hardware section to the Non-Software Licenses page
Recommended the CERN OHL v2 family of licenses and linked to software
licenses with similar terms.  Also added mention of the Creative Commons
licenses often used for hardware.
2021-08-23 17:22:49 -06:00
nytpu
22bc080c4f Add the CERN Open Hardware version 2 family of licenses 2021-08-23 17:08:49 -06:00
Mike Linksvayer
b3b74f9efa
Merge pull request #833 from Pukimaa/patch-1
[#804] Dark Mode
2021-08-23 11:52:25 -07:00
Mike Linksvayer
4d35b8542f
Merge branch 'gh-pages' into patch-1 2021-08-23 11:46:49 -07:00
Waldir Pimenta
250dcb2d2a
Make { and } in the home page headings less conspicuous in the dark mode/consistent with light mode
Tabs to spaces

Suggested in https://github.com/github/choosealicense.com/pull/833#issuecomment-898684123
2021-08-23 11:45:18 -07:00
Mike Linksvayer
3cfe5cff1c
Merge pull request #851 from waldyrious/patch-1
0BSD: update usage examples
2021-08-13 13:09:44 -07:00
Waldir Pimenta
ed2c65d9f6
0BSD: update usage examples
Use one example with the title and copyright notice, one with just the latter, and one with neither.
2021-08-13 20:33:03 +01:00
Mike Linksvayer
7fbc9f2b2d
Merge branch 'gh-pages' into patch-1 2021-08-13 12:16:46 -07:00
Mike Linksvayer
3eac53eff0
Merge pull request #850 from mlinksva/gh-pages
Make css and js load correctly if site rendered in a subdirectory
2021-08-13 12:13:34 -07:00
Mike Linksvayer
feba36a467
Make css and js load correctly if site rendered in a subdirectory
to make showig changes from {user}.github.io/choosealicense.com
possible, as suggested by @waldyrious in
https://github.com/github/choosealicense.com/pull/833#issuecomment-860777503

Note links within the site will still break in this scenario, would
need relative_url sprinkled in all internal links to avoid. Non-goal
for now.
2021-08-13 12:06:15 -07:00
Mike Linksvayer
d98e8991e8
Merge pull request #845 from github/consistency2
Better consistency between ISC and 0BSD
2021-08-10 12:13:08 -07:00
Vaporox
ad8613ba28
Better consistency between MIT and derivatives 2021-08-09 12:35:45 -07:00
Mike Linksvayer
a97d9b8441
Merge pull request #843 from waldyrious/0bsd-title
Restore title in text of 0BSD license (now present in SPDX)
2021-08-06 09:29:50 -07:00
Waldir Pimenta
b84af5cd38 Restore title in text of 0BSD license (now present in SPDX)
This reverts commit bab9f14fa9.
2021-08-05 21:59:54 +01:00
Mike Linksvayer
24b87ca27c
Merge pull request #834 from wswartzendruber/enhancement/osl-afl-3.0-consistency
Making the OSL-3.0 and AFL-3.0 formatting consistent with each other.
2021-07-05 21:44:11 -07:00
Mike Linksvayer
2b9d5c2c60
Merge branch 'gh-pages' into enhancement/osl-afl-3.0-consistency 2021-07-05 21:35:42 -07:00
Mike Linksvayer
acfc2a8724
Merge pull request #835 from github/bsd3-flutter
Update BSD-3-Clause examples because d3 is now ISC licensed
2021-07-05 21:35:27 -07:00
Mike Linksvayer
4037f7168e
Update BSD-3-Clause examples because d3 is now ISC licensed 2021-07-05 21:31:41 -07:00
William Swartzendruber
ca19f18cc5
Making the OSL-3.0 and AFL-3.0 text consistent with each other. 2021-07-05 18:59:21 -06:00
Pukima
b1e0ee80b4
[Dark Mode] Added !importants and unthemed parts 2021-06-20 15:54:29 +02:00
Pukima
7d69089033
added DarkMode 2021-06-12 17:01:43 +02:00
Mike Linksvayer
b2e3f43e7f
Merge pull request #832 from github/ruby273
update ruby version to match github-pages gem
2021-06-06 10:46:01 -07:00
Mike Linksvayer
c52ac07d8e
update ruby version to match github-pages gem 2021-06-06 12:41:02 -05:00
Mike Linksvayer
ebf76c2f97
Merge pull request #831 from r00ster91/patch-3
Improve sidebar reference links
2021-05-29 19:02:27 -07:00
r00ster
9b74f0ea65
Improve sidebar reference links 2021-05-29 23:55:46 +02:00
Mike Linksvayer
42466b799a
Merge pull request #823 from github/webrick
Add webrick to Gemfile so jekyll serve works under ruby 3
2021-04-05 00:19:02 -07:00
Mike Linksvayer
3494f9e011
rubocop 2021-04-05 00:17:33 -07:00
Mike Linksvayer
91817e84d4
Add webrick to Gemfile so jekyll serve works under ruby 3
As noted in https://github.com/github/choosealicense.com/issues/822
2021-04-05 00:13:49 -07:00
Mike Linksvayer
b5a6416045
Merge pull request #821 from github/ruby3
Allow bundle updae and tests to be run under ruby 3
2021-04-04 23:10:40 -07:00
Mike Linksvayer
ec9bbeaeae
Allow bundle updae and tests to be run under ruby 3 2021-04-04 23:09:00 -07:00
Mike Linksvayer
0c4ee982e5
Merge pull request #819 from github/mulan-nickname
Add Mulan PSL v2 as nickname for MulanPSL-2.0
2021-04-04 22:20:43 -07:00
Mike Linksvayer
f807d03fae
Add Mulan PSL v2 as nickname for MulanPSL-2.0 2021-04-04 20:36:09 -07:00
Mike Linksvayer
b9f5d35d15
Merge pull request #818 from TheInterestingSoul/gh-pages
Add the Mulan-PSL v2 license
2021-04-04 19:51:01 -07:00
TheInterestingSoul
49800f1b9b
Remove the duplicate line in MulanPSL-2.0
Forgive me for not wearing glasses.
2021-04-05 10:45:57 +08:00
TheInterestingSoul
3704417316
Correct writing in MulanPSL-2.0 2021-04-05 10:41:43 +08:00
TheInterestingSoul
071d0a76ab
Change the using example in MulanPSL-v2
Got one from Google search with `site:github.com` qualifier. (
2021-04-05 10:34:27 +08:00
TheInterestingSoul
f0efa379bb
Correct the writing format in MulanPSL-2.0 2021-04-05 10:23:29 +08:00
TheInterestingSoul
74170e098a
Update using example in MulanPSL-2.0
Huawei LiteOS is licensed under BSD-3-Clause, but the security function library, called `libsec`, is stored in a secondary directory.
2021-04-05 09:57:34 +08:00
TheInterestingSoul
3d952744bc
Fix missing comma in MulanPSL-2.0 2021-04-05 09:50:15 +08:00
TheInterestingSoul
86129dc939 Change the comma form for MulanPSL-v2 2021-04-04 15:32:23 +08:00
TheInterestingSoul
7aa8552234 Correct the for MulanPSL-v2 2021-04-04 15:18:06 +08:00
TheInterestingSoul
8ab1de2000 Correct the wrap lines for MulanPSL-v2 2021-04-04 15:13:09 +08:00