1
0
mirror of https://github.com/github/choosealicense.com synced 2024-06-17 00:19:51 +02:00
Commit Graph

1514 Commits

Author SHA1 Message Date
Jake Jarvis
67a6eb3066
Some wordiness reduction and grammar fixes 2019-08-26 16:43:35 -04: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
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
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
791e3fe05a
no md in license fields 2019-02-15 15:05:40 -08:00
Mike Linksvayer
1e739774ea
Merge pull request #643 from jhabdas/gh-pages
Add Zero Clause BSD license
2019-02-15 15:04:18 -08:00
Mike Linksvayer
30256010e8 sort fields 2019-02-15 14:52:33 -08:00
Mike Linksvayer
370fd14517 use same url when linking to same content 2019-02-15 14:02:02 -08:00
Mike Linksvayer
2d8591605c don't test edit link links 2019-02-15 13:58:25 -08:00
Mike Linksvayer
bab9f14fa9
rm license title in text not present in SPDX version 2019-02-15 13:32:29 -08:00
Mike Linksvayer
f8df70d9fa
use spdx name in title 2019-02-15 13:27:38 -08:00
Mike Linksvayer
2f9e41877b
Merge branch 'gh-pages' into gh-pages 2019-02-15 13:04:22 -08:00
Mike Linksvayer
d1a721a590
Merge pull request #645 from github/https-test-on
Revert "Revert "require https for external links""
2019-02-15 13:04:00 -08:00
Mike Linksvayer
e0ffac1d8c
Merge branch 'gh-pages' into https-test-on 2019-02-15 13:00:03 -08:00
Mike Linksvayer
52908c2b89
Merge pull request #644 from github/rm-superflous-project
Remove superfluous instruction from bsd-3-clause* 'how' field
2019-02-15 12:57:29 -08:00
Mike Linksvayer
40031df9e2 Remove superfluous instruction from bsd-3-clause* 'how' field 2019-02-15 12:51:55 -08:00
Mike Linksvayer
cfb5edcfe8
Merge branch 'gh-pages' into gh-pages 2019-02-15 12:35:34 -08:00
Mike Linksvayer
baf09f6bd9
(c) notice and instruction tweaks
Make consistent with BSD-2- and 3-Clause. Don't encourage people to add email without thinking.

Someone choosing the license shouldn't remove the license text or disclaimer, or they won't be offering the license at all or in a way that makes sense. :)
2019-02-15 12:27:51 -08:00
Josh Habdas
8633463353
Add Zero Clause BSD license
close #642
2019-02-15 18:32:05 +08:00
Mike Linksvayer
9c08bb310d Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into https-test-on 2019-02-11 14:24:26 -08:00
Mike Linksvayer
44260e9c6b
Merge pull request #640 from github/upl-example-moved
Update UPL-1.0 example which was moved
2019-01-29 22:20:28 -08:00
Mike Linksvayer
e8a24a5ee9 Update UPL-1.0 example which was moved 2019-01-29 22:16:09 -08:00