Stephen Mather
83db3d66ed
Merge branch 'gh-pages' into patch-1
2019-01-12 19:41:45 -05:00
Stephen Vincent Mather
29f6717b6f
move odbl.txt and update header
2019-01-12 19:40:55 -05: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
Stephen Mather
3b2540d30d
Merge pull request #1 from github/gh-pages
...
Pull in latest
2019-01-12 11:01:23 -05:00
Stephen Mather
b11d5480dd
add hidden attribute
2019-01-12 10:59:57 -05: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 bb0bb92b51
.
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
Edward J
3e69b262f8
Add GNU name convention to _licenses/gpl-3.0.txt.
2018-10-27 17:05:03 +01:00
Edward J
5450a4c251
Edit _licenses/lgpl-3.0.txt to make how clearer...
...
that both licenses are in same folder (as stated by GNU page <http://www.gnu.org/licenses/gpl-howto.html >).
2018-10-23 18:43:05 +01:00
Mike Linksvayer
2e1e498e7d
Merge pull request #613 from github/gplcc
...
add gplcc note to gpl-2.0 and lgpl-2.1 sidebars
2018-10-22 10:58:59 -07:00
Mike Linksvayer
1345af88e4
add gplcc note to gpl-2.0 and lgpl-2.1 sidebars
2018-10-21 15:07:51 -07:00
Mike Linksvayer
8d579321cc
Merge pull request #610 from felubra/suggest-license
...
feat: suggest the license to a repository from the license page
2018-10-21 14:39:36 -07:00
Mike Linksvayer
980007f9aa
Merge branch 'gh-pages' into suggest-license
2018-10-19 12:07:40 +02:00
Mike Linksvayer
1016edfd2b
Merge pull request #612 from github/hydra
...
Throttle concurrency of html link checker
2018-10-19 12:07:17 +02:00
Mike Linksvayer
da8b1d2194
Throttle concurrency of html link checker
...
spdx.org obtains 503 if too many connections opened, it seems eg
https://travis-ci.org/github/choosealicense.com/builds/439831256
Problem goes away locally when html-proofer/typhoeus/hydra default
changed from 200 to 10
2018-10-19 11:55:08 +02:00
Mike Linksvayer
5177d06459
avoid redirect
2018-10-19 08:44:23 +02:00
Mike Linksvayer
09f172e22e
minor suggest-license edits
2018-10-19 08:23:57 +02:00
Felipe Lube de Bragança
a5d8c68fe6
More explanation to the user about the suggest feature
2018-10-18 17:13:48 -03:00
Felipe Lube de Bragança
2d3c449b36
Allow the user log-in, since the URL to suggest a license is restricted
2018-10-15 09:57:14 -03:00
Felipe Lube de Bragança
dc0deb0326
Avoid popup blockers by using redirection
2018-10-15 07:35:27 -03:00
Felipe Lübe de Bragança
c070f17c1c
Merge branch 'gh-pages' into suggest-license
2018-10-14 21:01:15 -03:00
Felipe Lube de Bragança
4f1eab6997
License suggestion by repo URL
2018-10-14 20:21:54 -03:00
Felipe Lube de Bragança
b30306e502
remove not used autocomplete plugin
2018-10-14 19:58:43 -03:00
Mike Linksvayer
2db49e1e50
Merge pull request #611 from github/post-source
...
Remove obsolete `if page.source`
2018-10-10 15:43:34 -07:00