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

345 Commits

Author SHA1 Message Date
Mike Linksvayer
ba48c3d877 rm unneeded trailing whitespace from various files 2019-12-25 10:58:01 -08:00
Mike Linksvayer
2bb6e2fc97
Merge branch 'gh-pages' into bsd-4-clause-tweaks 2019-11-23 14:40:20 -08:00
Mike Linksvayer
2ceafa9b13
BSD-4-Clause tweaks
Following up on #669 

- hidden is not needed as it is the default
- shorten description, don't refer to "4th clause" as the advertising clause is actually the 3rd clause
2019-11-23 14:34:23 -08:00
Mike Linksvayer
dee309c3b5
Merge branch 'gh-pages' into cc0-source-text 2019-11-23 14:28:11 -08:00
Mike Linksvayer
c6c26b797f
Master branch for example so if use case changes tests will detect 2019-11-23 14:24:42 -08:00
Alistair Francis
ffb3a73623 Add the BSD-4-Clause license
This adds the BSD-4-clause license type.

1. SPDX Identifier: https://spdx.org/licenses/BSD-4-Clause.html
2. GNU's list of free licenses: https://www.gnu.org/licenses/license-list.en.html#OriginalBSD and FSF approved
3. Over 1000 projects: https://github.com/search?q=BSD+4-Clause+filename%3ALICENSE&type=Code
4. Yosemite Blockchain, pwolfgang/querybuilder and PMSPAUR-public use the BSD-4-clause license

This is based on the previous work of: https://github.com/github/choosealicense.com/pull/511

Signed-off-by: Alistair Francis <alistair@alistair23.me>
2019-11-23 13:56:52 -08:00
Mike Linksvayer
379bf41d44 fix yaml, test 2019-11-20 08:11:57 -08:00
Mike Linksvayer
44c8b266ac
unhide cc0 2019-11-20 08:06:37 -08:00
Mike Linksvayer
7a93042df8
Merge branch 'gh-pages' into bin-no-by 2019-11-19 15:48:46 -08:00
Mike Linksvayer
3766d508c4
Merge branch 'gh-pages' into cc0-source-text 2019-11-19 15:45:51 -08:00
Waldir Pimenta
3aec270042 Add examples for Creative Commons licenses and OFL
Also adjust instructions in README.md to match CONTRIBUTING.md
2019-11-19 23:13:41 +00:00
Mike Linksvayer
32195a084f
Merge branch 'gh-pages' into cc0-source-text 2019-11-19 10:39:06 -08:00
Mike Linksvayer
08ec1de724 Add BSL-1.0 and Zlib examples 2019-11-18 10:32:39 -08:00
Mike Linksvayer
4e62d749b0 Add include-copyright--source condition to more precisely describe bsl-1.0 and zlib 2019-11-18 10:21:22 -08:00
Mike Linksvayer
ab4c8ba384 Add nickname for BSD-3-Clause-Clear
Used in https://github.com/licensee/licensee/pull/391
2019-10-25 11:43:26 -07:00
Anne van Kesteren
47a7d95c20
HTTPS is great 2019-09-25 15:36:34 +02:00
Mike Linksvayer
83b6d75751
sort examples 2019-08-26 12:25:23 -07:00
Mike Linksvayer
bdd11363cc
rewrite description 2019-08-26 12:24:35 -07:00
Mike Linksvayer
231cc3167f swap out example provided at https://github.com/github/choosealicense.com/pull/527#issuecomment-524334219 2019-08-26 11:27:05 -07:00
Mike Linksvayer
eca2abe5e9
Merge branch 'gh-pages' into patch-1 2019-08-17 16:02:40 -07:00
Mike Linksvayer
a03c1068c8
Swap out no longer detectable UPL-1.0 example 2019-06-27 20:36:45 -07:00
Mike Linksvayer
00f09537ea Consistent formatting of AFL-3.0 and OSL-3.0 2019-06-20 12:48:21 -07:00
Mike Linksvayer
4a3eb294b2 fr version of example to match cataloged license fr text 2019-06-17 16:31:37 -07:00
Mike Linksvayer
0fef6306fd
Merge branch 'gh-pages' into patch-1 2019-06-17 15:46:57 -07:00
Mike Linksvayer
0f1090dcfb openhab upgraded to EPL-2.0, adjust examples 2019-06-17 15:41:35 -07:00
Mike Linksvayer
ff2beb2af6
Merge branch 'gh-pages' into patch-1 2019-06-17 15:18:43 -07:00
Mike Linksvayer
c0d02f6e4b
Merge branch 'gh-pages' into patch-1 2019-05-31 16:58:43 -07:00
Mike Linksvayer
15ec920b45
replace license text with https://www.opendatacommons.org/files/2018/02/odbl-10.txt
it wraps at <78 chars
it has better formatting fidelity than the text version currently generated by SPDX
2019-05-31 16:57:02 -07:00
Avi Miller
b89307405f
Fix typo in UPL-1.0.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2019-05-22 07:34:36 +10:00
johanricher
54f2cdf6e5 Replace by notable projects using ODbL 2019-04-28 19:41:23 +02:00
johanricher
106e942fc5 Remove RATP and change the links 2019-04-18 10:26:11 +02:00
johanricher
8ece016c33 change "limitations" 2019-04-09 19:52:59 +02:00
johanricher
f6f9a3d82b change "conditions" 2019-04-09 19:51:43 +02:00
johanricher
9bad2dfce0 sort lines 2019-04-09 19:45:15 +02:00
johanricher
5e20276193 modify "using" examples 2019-04-09 19:43:54 +02:00
johanricher
2566df6b16 modify "how" instructions 2019-04-09 19:35:20 +02:00
johanricher
54364a436a modify description 2019-04-09 19:33:14 +02:00
johanricher
b2c6b62aa0 shorten nickname 2019-04-09 19:32:26 +02:00
johanricher
0a2f922896 use license text from SPDX 2019-04-09 19:26:23 +02:00
johanricher
c3208b0fd2 sort lines 2019-04-09 19:22:57 +02:00
johanricher
e8d5aebdf9 remove unnecessary lines 2019-04-09 19:19:49 +02:00
johanricher
dd6abf2f32 change license title in order to match SPDX 2019-04-09 19:13:30 +02:00
Mike Linksvayer
d7f9b3d635 remove extra copy of license text 2019-03-26 20:19:26 -07:00
Mike Linksvayer
2e9ffdf950
Merge branch 'gh-pages' into patch-1 2019-03-26 20:03:46 -07:00
Mike Linksvayer
cef64eba52
Merge branch 'gh-pages' into patch-1 2019-02-25 09:04:31 -08:00
Mike Linksvayer
247d7f22d8
source field no longer used 2019-02-25 09:04:18 -08:00
Mike Linksvayer
791e3fe05a
no md in license fields 2019-02-15 15:05:40 -08:00
Mike Linksvayer
30256010e8 sort fields 2019-02-15 14:52:33 -08:00
Mike Linksvayer
2e8ba1b762
Merge branch 'gh-pages' into patch-1 2019-02-15 13:39:44 -08:00
Mike Linksvayer
bab9f14fa9
rm license title in text not present in SPDX version 2019-02-15 13:32:29 -08:00