1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

1473 Commits

Author SHA1 Message Date
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
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
Mike Linksvayer
260bae00d9 Revert "Revert "require https for external links""
This reverts commit af5f80ddfd845de5cf59cfe5594953e84641990b.

New release of pages gem should allow this to work.
2019-01-29 09:39:47 -08:00
Mike Linksvayer
680ac9ddb4
Merge pull request #635 from github/contributing-must-match-spdx
Adding a license docs: more consistent phrasing, license text should match SPDX's data
2019-01-12 16:26:02 -08:00
Mike Linksvayer
6c6ca6c29e
Replace existing SPDX match with more explicit instruction
It was already mentioned!
2019-01-12 16:22:49 -08:00
Mike Linksvayer
570df49361
Adding a license docs: more consistent phrasing, license text should match SPDX's data
Adding https://github.com/github/choosealicense.com/pull/195#issuecomment-453790951 to documenation
2019-01-12 16:19:34 -08:00
Mike Linksvayer
a40ef42140
bullets magic 2019-01-08 11:52:21 -08:00
Mike Linksvayer
b1c55b6e97
Merge pull request #633 from vanillajonathan/patch-1
Add bullets to the list of options
2019-01-08 11:28:29 -08:00
Mike Linksvayer
8a3e6f375c
rm blank lines not needed with bullets 2019-01-08 11:19:26 -08:00
Jonathan
7dbea0c3a6
Add bullets to the list of options 2019-01-08 16:26:44 +01:00
Mike Linksvayer
c75e7361d8
Merge pull request #631 from github/https-test
Don't allow links to non-https sites
2019-01-03 10:56:14 -08:00
Mike Linksvayer
717f76a051 gem update --system so that bundler 2 can be installed 2019-01-03 10:51:47 -08:00
Mike Linksvayer
af5f80ddfd Revert "require https for external links"
This reverts commit bb0bb92b51e3aad94a2f405d5492ce3e46f8fc70.

Remove actual test for now, as it causes failures in CI, where github.com links get generated as http

Eventually this should be fixed with https://github.com/github/pages-gem/pull/611 or similar
2019-01-02 22:25:47 -08:00
Mike Linksvayer
8ff6ce0e1f rm two resources that don't support https 2019-01-02 12:48:12 -08:00
Mike Linksvayer
70302076ef hardcode https for webfont 2019-01-02 12:45:17 -08:00
Mike Linksvayer
04306c7740 Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into https-test 2019-01-02 12:33:29 -08:00
Mike Linksvayer
bb0bb92b51 require https for external links 2019-01-02 12:32:52 -08:00
Mike Linksvayer
78ad4874ae
Merge pull request #627 from derpmarine168/patch-1
Include Rust in community.md
2018-12-09 11:58:39 -08:00
Mike Linksvayer
56faa501cf
alphasort 2018-12-09 14:51:39 -05:00
Mike Linksvayer
7cfdeb1256
no period matching other items 2018-12-09 14:49:52 -05:00
Mike Linksvayer
7998240287
link to evidence of community license practice matching other items 2018-12-09 14:49:10 -05:00
Derpy
62a4c215e8
Include rust
It's growing............
2018-12-09 15:22:47 +00:00
Mike Linksvayer
dd3addb458
Merge pull request #622 from JoelKatz/patch-1
Remove "use" from list of things that require a license
2018-11-02 11:07:42 -07:00
David Schwartz
0b7ac504fd
Remove "use" list of things that require a license
At least in the United States, you can use a copyrighted work without having a license. 17 USC 106 lists the things you need a license to do and it does not include the ordinary use of a lawfully-acquired copy of a work. If this wasn't true, you couldn't even read a book you owned unless that book included an explicit license (and most don't).
2018-11-01 03:08:21 -07:00
Mike Linksvayer
c074563868
Merge pull request #621 from andrewvora/patch-2
Fixed some typos in sidebar
2018-10-31 23:14:14 -07:00
Andrew Vorakrajangthiti
59912a7e54
Fixed some typos in sidebar
Sorry 🙏 just had to
2018-10-31 23:11:10 -07:00
Mike Linksvayer
7eebfb905a
Merge pull request #616 from github/pg-licensce
Spell Licence with an s in PGSQL title
2018-10-29 10:28:00 -07:00
Mike Linksvayer
a3b34cbaf3
Spell Licence with an s in PGSQL title 2018-10-28 09:20:29 -07:00
Mike Linksvayer
42e83d1315
Merge pull request #615 from user-e/patch-1
Edit _licenses/lgpl-3.0.txt to make how clearer...
2018-10-27 09:49:55 -07:00
Mike Linksvayer
50b8224656
rubocop 2018-10-27 16:47:47 +00:00
Mike Linksvayer
2eced946c7
update ruby version 2018-10-27 16:32:55 +00:00
Edward J
6f7c6a8860
Merge pull request #1 from user-e/patch-2
Add GNU name convention to _licenses/gpl-3.0.txt.
2018-10-27 17:21:04 +01:00