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

1771 Commits

Author SHA1 Message Date
Julian Stirling
86d1a77510 CERN-OHL-S Fix another YAML error 2022-06-12 20:01:33 +01:00
Julian Stirling
6911db7ba1 CERN-OHL: Fix YAML errors in note, tweak language (thanks @waldyrious) 2022-06-12 19:55:43 +01:00
Julian Stirling
5065c967dc update CERN-OHL-S examples 2022-06-12 09:18:42 +01:00
Javier Serrano
a38f57220f Shorten note field contents for CERN OHL v2 licenses 2022-06-12 09:38:19 +02:00
j-sp
f1e3b5da45
Update cern-ohl-w-2.0.txt
Clarify usage guidelines for W variant of CERN OHL v2
2022-06-10 23:05:05 +02:00
j-sp
788c281d2f
Update cern-ohl-s-2.0.txt
Clarify usage guidelines for S variant of CERN OHL v2
2022-06-10 23:02:17 +02:00
j-sp
072e77d29e
Update cern-ohl-s-2.0.txt
Avoid word "virally"
2022-06-10 23:00:20 +02:00
j-sp
683f3e932d
Update cern-ohl-p-2.0.txt
Clarify use guidelines of p variant
2022-06-10 22:57:49 +02:00
Mike Linksvayer
0724d843b8
Merge branch 'gh-pages' into add-CERN-OHL-V2 2022-06-10 14:40:54 -04:00
Mike Linksvayer
de42758cec
Fix react-use example 2022-06-10 11:38:10 -07:00
Mike Linksvayer
9ff30caccd
update unlicense examples 2022-06-10 11:32:37 -07:00
Julian Stirling
0d7c2d161f Update projects using CERN-OHL-S and CERN-OHL-P 2022-06-10 17:35:06 +01:00
Mike Linksvayer
8b99ed7734
Merge branch 'gh-pages' into gh-pages 2022-06-10 12:06:19 -04:00
Mike Linksvayer
fb5377a862
Merge pull request #984 from renbaoshuo/patch-1
chore: remove git.io
2022-04-27 07:53:16 -07:00
Mike Linksvayer
8359cdcb3f
avoid master->gh-pages redirect 2022-04-27 07:43:32 -07:00
Baoshuo Ren
1a2ed66239
chore: remove git.io
All links on git.io will stop redirecting after April 29, 2022.

- https://github.blog/changelog/2022-04-25-git-io-deprecation/
2022-04-27 17:19:40 +08:00
Mike Linksvayer
48c1e44d1d
Merge pull request #981 from liyishuai/mulan
mulan: fix wrapping and trim space
2022-04-14 16:53:19 -07:00
Mike Linksvayer
242b0638db
update cncf link 2022-04-14 16:50:00 -07:00
Yishuai Li
5881f34b1e
mulan: fix wrapping and trim space 2022-04-14 19:36:12 -04:00
Mike Linksvayer
639dac9dc5
Fix EUPL-1.1 guidance link 2022-03-16 16:08:34 -07:00
Mike Linksvayer
c4d4c3a348
Merge pull request #945 from Tyler887/patch-7
.NET Core > .NET
2022-03-16 16:01:05 -07:00
Tyler887
d91f364d2c
Update _licenses/mit.txt
Co-authored-by: Mike Linksvayer <mlinksva@github.com>
2022-03-16 22:38:38 +00:00
Tyler887
1a37894edb
.NET Core > .NET 2022-03-16 16:43:17 +00:00
Mike Linksvayer
958b6849c7
Merge pull request #943 from aisgbnok/904-realtive-font-units
Replace font-size absolute units with relative units
2022-02-23 10:20:04 -08:00
Anthony Swierkosz
e56839b73a
Replace px font units with rem, resolves #904 2022-02-23 03:47:36 -05:00
Mike Linksvayer
de3c3156da
Merge pull request #935 from Tyler887/patch-6
404 screen
2022-01-24 09:47:34 -08:00
Tyler887
d657524e46
404 screen 2022-01-22 23:38:19 +00:00
Mike Linksvayer
85703571e2
Merge branch 'gh-pages' into gh-pages 2022-01-22 14:14:48 -08:00
Mike Linksvayer
e0819a3a92
Merge pull request #934 from Tyler887/patch-6
Remove "all rights reserved" from BSD-[23]-Clause reflecting recent SPDX update
2022-01-22 13:50:39 -08:00
Mike Linksvayer
164971616d
Reflect 44691632d2 2022-01-22 13:49:06 -08:00
Tyler887
f1a7e33d19
Remove "all rights reserved" 2022-01-22 09:03:27 +00:00
Mike Linksvayer
20d853259a
rubocop suggestions 2022-01-05 17:51:14 -08:00
Mike Linksvayer
c5fa06a734
Merge pull request #926 from Tyler887/patch-6
Meta tweak: Update license year to 2022
2022-01-05 17:23:16 -08:00
Tyler887
74912ba63d
Update LICENSE.md 2022-01-05 12:28:41 +00:00
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