1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-13 23:18:53 +01:00
Commit Graph

1545 Commits

Author SHA1 Message Date
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
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
Mike Linksvayer
0fef6306fd
Merge branch 'gh-pages' into patch-1 2019-06-17 15:46:57 -07:00
Mike Linksvayer
722b1dd8aa
Merge pull request #660 from github/epl-examples
openhab upgraded to EPL-2.0, adjust examples
2019-06-17 15:46:34 -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
2b65f00e19
Merge pull request #656 from johanricher/patch-1
Add ODbL
2019-05-31 17:05:18 -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
Mike Linksvayer
00c124d860
Merge pull request #659 from oracle/fix-upl-typo
Fix typo in UPL-1.0.
2019-05-21 23:39:57 +02: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