1
0
mirror of https://github.com/github/choosealicense.com synced 2024-07-03 17:09:12 +02:00
Commit Graph

1825 Commits

Author SHA1 Message Date
Mike Linksvayer
d68908d829
update examples
Update skater LICENSE url
Replace example with Roc so that there's not two examples from one company
2023-03-29 15:17:57 -07:00
Thomas Mechelke
d5b399f069
Fix inconsistent quotes in UPL-1.0
Replace non-ASCII quotes with ASCII quotes to
- match line 38: the "Software"
- match line 60: PROVIDED "AS IS"
- match the license authors version at https://oss.oracle.com/licenses/upl/
- match the spdx version at https://spdx.org/licenses/UPL-1.0.html
2023-03-29 19:14:30 +02:00
Mike Linksvayer
0ccd6c5d0c
Merge pull request #1066 from github/bsd-3-nickname
Add "Modified" nickname to BSD-3-Clause
2022-12-27 17:22:18 -08:00
Mike Linksvayer
b62ee46b31
Add "Modified" nickname to BSD-3-Clause
Note it has a number of nicknames https://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_(%22BSD_License_2.0%22,_%22Revised_BSD_License%22,_%22New_BSD_License%22,_or_%22Modified_BSD_License%22) the first two of which are captured in the current title.

This change will facilitate matching a semi-common markup version, see https://github.com/licensee/licensee/pull/578
2022-12-27 15:03:56 -08:00
Mike Linksvayer
2b3259f309
Merge pull request #918 from Tyler887/patch-5
Add GNU Free Documentation License v1.3
2022-09-26 10:02:28 -07:00
Mike Linksvayer
8182e4ac4d
Merge branch 'gh-pages' into patch-5 2022-09-26 09:55:17 -07:00
Mike Linksvayer
ebef287bbd
accommodate code.qt.io in tests 2022-09-26 09:53:00 -07:00
Mike Linksvayer
4dfc9d921a
Qt docs example 2022-09-26 09:42:10 -07:00
Mike Linksvayer
537d2a7d7f
Use examples
From https://github.com/github/choosealicense.com/pull/918#issuecomment-1246154659
2022-09-14 08:11:24 -07:00
Mike Linksvayer
be0ffed9e8
Ignore testing of opensource.org which fails only in CI
eg https://github.com/github/choosealicense.com/runs/8026421690?check_suite_focus=true
2022-09-05 13:54:12 -07:00
Mike Linksvayer
060b967c43
spacing 2022-09-02 14:25:09 -07:00
Mike Linksvayer
2f02459de0
instructions suggest after title page not title part of each file
Reword to try to make work for all situations
2022-09-02 14:10:16 -07:00
Mike Linksvayer
656ab18ed7
more or-later or -only handling 2022-09-02 14:05:20 -07:00
Mike Linksvayer
8df38b1a57
Merge branch 'gh-pages' into patch-5 2022-09-02 13:49:54 -07:00
Mike Linksvayer
9d7ed39538
Merge pull request #1025 from StEvUgnIn/patch-1
Add Grafana as AGPL-3.0 licensor
2022-08-25 15:30:22 -07:00
Mike Linksvayer
cce738fbed
remove agpl-3.0 from legacy list with no examples since we're adding 3 2022-08-25 15:27:30 -07:00
Mike Linksvayer
088a44d903
2 more examples 2022-08-25 15:24:24 -07:00
Steve Huguenin-Elie
d157535898
Add Grafana as AGPL-3.0 licensor
https://grafana.com/blog/2021/04/20/grafana-loki-tempo-relicensing-to-agplv3/
2022-08-25 10:37:39 +02:00
Mike Linksvayer
264d958c67
Merge pull request #1018 from Aeris1One/patch-1
add network-use-disclose to CeCILL v2
2022-08-22 09:32:29 -07:00
Mike Linksvayer
cdafae7df0
Merge branch 'gh-pages' into patch-1 2022-08-19 13:15:01 -07:00
Mike Linksvayer
ce3a168639
update ruby version to match pages-gem 2022-08-19 13:14:46 -07:00
Aeris One
3084254b38
add network-use-disclose to CeCILL v2 2022-08-19 21:39:22 +02:00
Mike Linksvayer
62dfebe236
Merge pull request #1014 from c0nspiracy/patch-1
Fix typo in non-software licenses page
2022-07-19 10:24:57 -07:00
Robert Newbould
cf8f0d79e5
Fix typo in non-software licenses page
Corrects `recommond` to `recommend`
2022-07-19 14:22:25 +01:00
Mike Linksvayer
695f9ca121
Merge pull request #1013 from paulyy-y/patch-1
Fixes FPGA acronym.
2022-07-17 11:34:12 -07:00
Paul
537ffa46d8
Fixes FPGA acronym. 2022-07-17 08:40:19 -07:00
Mike Linksvayer
43f355b281
fix note field for CERN OHL licenses (unintentionally a dictionary value), simplify rendering of field 2022-07-09 12:33:02 -07:00
Mike Linksvayer
66a10061b9
Merge pull request #1004 from julianstirling/add-CERN-OHL-V2
Add cern ohl v2
2022-07-09 11:55:11 -07:00
Mike Linksvayer
9e46d36648
rm extra space 2022-07-09 11:52:56 -07:00
Mike Linksvayer
4ea525e0a6
update cncf link again 2022-07-08 12:31:03 -07:00
Mike Linksvayer
66d3a26c0e
Merge branch 'gh-pages' into add-CERN-OHL-V2 2022-07-08 12:14:23 -07:00
Mike Linksvayer
78c2ee95a4
tighten up non-software text 2022-07-08 12:09:10 -07:00
Mike Linksvayer
55912b6175
P description 2022-07-06 18:17:07 -07:00
Mike Linksvayer
51ddb5d8f2
-S description edit proposed by @j-sp in https://github.com/github/choosealicense.com/pull/1004/files#r915184980 2022-07-06 18:03:27 -07:00
Mike Linksvayer
d4dbe723db
-w description edit proposed by @j-sp in https://github.com/github/choosealicense.com/pull/1004/files#r915192799 2022-07-06 18:02:09 -07:00
Mike Linksvayer
2a449d578a
same-license--library instead of --file 2022-07-06 17:58:17 -07:00
Mike Linksvayer
7695c8398e
Merge pull request #1008 from github/asf-faq
Update Apache-2.0 "note" with additional info
2022-06-30 12:40:40 -07:00
Mike Linksvayer
cba6a99283
spel! 2022-06-28 07:31:47 -07:00
Mike Linksvayer
c6f07cb8cc
Update Apache-2.0 "how"
ASF not AF; link to relevant FAQ entry

Inspired by #905 sort of
2022-06-28 07:29:43 -07:00
Mike Linksvayer
2cacbec889
Merge pull request #1005 from ZacharyCrespin/patch-1
make the text visible on yellow :target background
2022-06-26 17:06:42 -07:00
Zachary Crespin
65842b6f43
make the text visible on yellow :target background
The white text was not visible on the yellow :target background so I made it darker.
(this is only a problem with dark mode)
2022-06-16 17:11:53 -07:00
Mike Linksvayer
1891136eef
Merge branch 'gh-pages' into add-CERN-OHL-V2 2022-06-12 16:57:58 -07:00
Mike Linksvayer
15237620db
don't test help.github.com links
They work, unclear why failing in CI
2022-06-12 16:56:51 -07:00
Julian Stirling
44b121a807 Tweak using for CERN-OHL-P 2022-06-12 22:41:40 +01:00
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