docs/choosealicense.com
docs/choosealicense.com
1
0
Fork 0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00
Code Issues Releases Wiki Activity
1,575 Commits 3 Branches 0 Tags 5.1 MiB
Commit Graph

1575 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Linksvayer
e32336e5a8
Merge pull request #710 from github/rmtrailingwhitespace 
rm unneeded trailing whitespace from various files
 2019-12-26 11:59:52 -08:00
Mike Linksvayer
ba48c3d877 rm unneeded trailing whitespace from various files 2019-12-25 10:58:01 -08:00
Mike Linksvayer
3cc80f2602
Merge pull request #702 from github/refined-rules-appendix 
Make rules with -- eg same-license--file appear lighter in appendix table
 2019-12-04 18:42:03 -08:00
Mike Linksvayer
a378dbc7ff Make rules with -- eg same-license--file appear lighter in appendix table 
Not needed elsewhere eg license view because actual rule is spelled out
and no distinction with other licenses with non-attenuated versions of
the rules is useful for eyeballing

Some visual cue other than .5 opacity might be more useful, eg smaller
or not filled in circle, but this is easy first cut given current sprite
setup
 2019-12-02 21:32:07 -08:00
Mike Linksvayer
2880cbf44b
Merge pull request #700 from github/bsd-4-clause-tweaks 
BSD-4-Clause tweaks
 2019-11-23 14:42:56 -08:00
Mike Linksvayer
2bb6e2fc97
Merge branch 'gh-pages' into bsd-4-clause-tweaks 2019-11-23 14:40:20 -08:00
Mike Linksvayer
7ce405b330
Merge pull request #488 from github/cc0-source-text 
Use CC0-1.0 license text from source
 2019-11-23 14:37:39 -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
289246a8a9
Merge pull request #669 from alistair23/alistair/bsd-4-clause 
Add the BSD-4-Clause license
 2019-11-23 14:27:46 -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
e23d58b255 WIP: Bump licensee to the master branch 
This PR: https://github.com/licensee/licensee/pull/391 added support for
detecting the BSD 4-Clause license. Bump the local licensee to use the
master branch in order to correctly detect BSD 4-Clause licenses.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
 2019-11-23 14:10:51 -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
5c6737b47c
Merge pull request #698 from github/bin-no-by 
Add include-copyright--source condition to more precisely describe bsl-1.0 and zlib
 2019-11-22 12:37:39 -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
Mike Linksvayer
d11e79c035
Merge pull request #699 from waldyrious/add-project-examples 
Add examples for Creative Commons licenses and OFL
 2019-11-19 15:44:40 -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
1663d0c34b Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into bin-no-by 2019-11-18 10:33:56 -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
903530b7bb
Merge pull request #697 from github/rust-no-nursery 
Update Rust community license guidelines link
 2019-11-18 09:59:14 -08:00
Mike Linksvayer
cdc2aa2437
Update Rust community license guidelines link 2019-11-18 09:56:42 -08:00
Mike Linksvayer
8a290cffad
Merge pull request #690 from github/clearbsd-nick 
Add nickname for BSD-3-Clause-Clear
 2019-10-25 14:56:45 -07: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
Mike Linksvayer
263df342d4
Merge pull request #685 from annevk/patch-1 
HTTPS is great
 2019-09-25 11:30:22 -07:00
Anne van Kesteren
47a7d95c20
HTTPS is great 2019-09-25 15:36:34 +02:00
Mike Linksvayer
6ae33c9fdc
Merge pull request #527 from ljoubert/patch-1 
Added CeCILL Licenses v2.1
 2019-08-26 23:14:49 -07:00
Mike Linksvayer
4eaf9a5d4d
Merge branch 'gh-pages' into patch-1 2019-08-26 23:09:52 -07:00
Mike Linksvayer
d36697e452
Merge pull request #680 from jakejarvis/grammar 
Some wordiness reduction and grammar fixes
 2019-08-26 16:07:28 -07:00
Mike Linksvayer
47dc4ab737 edit edits 2019-08-26 16:04:07 -07:00
Jake Jarvis
67a6eb3066
Some wordiness reduction and grammar fixes 2019-08-26 16:43:35 -04: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
518c4bcf7a
Merge pull request #673 from github/sideids 
Make sidebar info bits directly linkable
 2019-07-10 22:34:03 -05:00
Mike Linksvayer
0a67070bf8 Merge branch 'gh-pages' into sideids 2019-07-09 10:17:37 -05:00
Mike Linksvayer
18ec54b71e add ids to sidebar for better linking 2019-07-09 10:15:56 -05:00
Mike Linksvayer
75df8e873c
Merge pull request #670 from github/upl-ex 
Swap out no longer detectable UPL-1.0 example
 2019-06-27 20:40:35 -07:00
Mike Linksvayer
a03c1068c8
Swap out no longer detectable UPL-1.0 example 2019-06-27 20:36:45 -07:00
Mike Linksvayer
abce45bf3d
Merge pull request #664 from github/afl-osl-fmt 
Consistent formatting of AFL-3.0 and OSL-3.0
 2019-06-20 15:22:57 -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
613c52a98c
Merge pull request #661 from github/jla 
Add Joinup Licensing Assistant to About: additional resources
 2019-06-19 09:08:10 -07:00
Mike Linksvayer
424d015911
Add Joinup Licensing Assistant to About: additional resources 
Additional background on the project at https://lists.spdx.org/g/Spdx-legal/topic/32099229#2628
 2019-06-18 17:07:52 -07:00
Mike Linksvayer
4b67edf0db relax github.com regex to allow for more branch names 2019-06-17 18:35:00 -07:00
Mike Linksvayer
4a3eb294b2 fr version of example to match cataloged license fr text 2019-06-17 16:31:37 -07:00