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

1596 Commits

Author SHA1 Message Date
emidiostani
354ff80904 fixed errors described in https://github.com/github/choosealicense.com/pull/320 2016-01-27 09:53:04 +01:00
Mike Linksvayer
e98ec06a7d consolidate no license info in /no-license, remove from /licenses
fixes #196
2016-01-26 13:42:29 -08:00
Mike Linksvayer
d5c23e2871 spel & mention lowercase spdx id w/example 2016-01-25 09:53:33 -08:00
martinsievers
749ea304e9 Removed "sub-license" and "patent-use" as suggested in comments on Github 2016-01-21 17:03:37 +01:00
sieversMartin
47a7dc9ffb Merge branch 'gh-pages' into gh-pages 2016-01-21 17:00:17 +01:00
Ben Balter
78aa0e14c6 Merge pull request #324 from github/hidden-by-default
Make licenses hidden by default
2016-01-20 12:24:18 -05:00
Ben Balter
fbef68f89b make it clear that license should be the spdx id 2016-01-20 10:43:57 -05:00
Ben Balter
ad1c2d9684 Catch invalid SPDX IDs when looking for the SPPX name, fixes #322 2016-01-20 10:42:36 -05:00
Ben Balter
ed908356e7 make licenses hidden by default 2016-01-20 10:37:44 -05:00
Ben Balter
5531742d10 better error output 2016-01-20 10:20:04 -05:00
martinsievers
53ff2a8686 Added a note and removed redirect again 2016-01-20 14:37:49 +01:00
martinsievers
57aa0e3764 Removed redirect attribute 2016-01-20 09:38:07 +01:00
martinsievers
e6f445f12b Renamed to pass cibuild 2016-01-20 09:36:02 +01:00
martinsievers
91e45575f0 Added fields 2016-01-19 17:54:36 +01:00
martinsievers
1dbf74ffc7 Added a nickname
Removed redirect
2016-01-19 17:51:08 +01:00
martinsievers
232235df26 Changed line breaks in order to pass the cibuild test 2016-01-19 17:23:01 +01:00
emidiostani
00df51e4a0 added eupl-1.1.txt licence 2016-01-19 14:58:28 +01:00
martinsievers
5362128137 Added license lppl-1-3c.txt. This is the standard license for developing LaTeX packages and classes 2016-01-19 13:54:30 +01:00
Mike Linksvayer
b7204165de Merge pull request #311 from mlinksva/tm-accuracy
Increase accuracy re trademark clauses
2016-01-18 14:27:52 -08:00
Ben Balter
58e9faeedf Merge pull request #318 from github/approval-script
Add script to check approval of a license.
2016-01-18 17:14:22 -05:00
Ben Balter
e505eb8fb9 check if license is aleady a license 2016-01-18 17:05:02 -05:00
Ben Balter
4013339bfd add fuzy match 2016-01-18 16:39:03 -05:00
Ben Balter
8de56f6e6f spelling 2016-01-18 16:20:33 -05:00
Ben Balter
6bc145a0de add code search 2016-01-18 16:19:29 -05:00
Ben Balter
8e56bb8315 add script/check-approval 2016-01-18 16:16:40 -05:00
Ben Balter
7a32aad01b add link to contributing from README 2016-01-18 15:35:06 -05:00
Ben Balter
46be738264 Merge pull request #316 from github/new-license-criteria
Document criteria for proposing new licenses
2016-01-18 15:33:53 -05:00
Ben Balter
c8012557a4 move FSF fix to the fsf_approved_licenses helper 2016-01-18 15:32:17 -05:00
Ben Balter
42e559a962 bullet point contributing instructions 2016-01-18 15:28:22 -05:00
Ben Balter
5e897e30b3 fix comment typo 2016-01-18 15:19:53 -05:00
Ben Balter
f7d68094e4 add gemfile to get tests to work 2016-01-15 18:08:04 -05:00
Ben Balter
976acac003 downgrade html proofer 2016-01-15 18:04:44 -05:00
Ben Balter
698d603cc9 run spec before proofer 2016-01-15 18:04:07 -05:00
Ben Balter
415ac8a174 fix spec 2016-01-15 18:01:07 -05:00
Ben Balter
853f4c97b2 check for license compliance 2016-01-15 17:40:32 -05:00
Mike Linksvayer
b0e7fd5a60 typos 2016-01-05 12:22:07 -08:00
Ben Balter
790109f099 add criteria for proposing new licenses 2016-01-05 14:48:06 -05:00
Mike Linksvayer
16bd726fd0 empty commit to force integration re-check 2015-12-15 17:03:54 -08:00
Ben Balter
fcc437a174 Merge pull request #312 from github/ignore-tldr
Ignore TL;DR Legal when running tests
2015-12-14 16:22:19 -05:00
Ben Balter
1c3ad39865 ignore tldr legal when running tests 2015-12-14 16:15:44 -05:00
Mike Linksvayer
587e104dc8 BSD and OFL licenses have no endorsement clauses, not explicit
non-grant of trademark rights.

Generalize description of trademark a bit to 'or' include other
marks, as some licenses include others, though trademark the only
universal among such licenses.
2015-12-14 11:15:38 -08:00
Mike Linksvayer
54de9d0e86 Slightly increase accuracy of trademark info:
- use not directly forbideen by certain licenses, rather rights not granted
- CC0-1.0 is one of those licenses with explicit non-grant
2015-12-14 11:03:17 -08:00
Brandon Keepers
7d4c11e390 Merge branch 'mina86-gh-pages' into gh-pages
* mina86-gh-pages:
  Fix GPL 3 link
  Prefer (L)GPL 3.0 to 2.x.
2015-11-22 14:10:15 -05:00
Brandon Keepers
c2c8a67d28 Fix GPL 3 link 2015-11-22 14:04:27 -05:00
Brandon Keepers
5abee34bbb Merge pull request #306 from waldyrious/using-bullet-list
format 'using' property as a bulleted list (fixes #292)
2015-11-22 13:50:30 -05:00
Michal Nazarewicz
1422ea3386 Prefer (L)GPL 3.0 to 2.x.
The GPL v3 is an improvement over v2 fixing several issues and
increasing compatibility with other free software licenses.  As such
there is no reason to feature v2 prominently rather than v3.  See
http://www.gnu.org/licenses/rms-why-gplv3.en.html for more rationale.
2015-11-17 16:00:02 +01:00
Aidan Feldman
35e1e9387a tweak wording on the non-code page to not actually make a recommendation 2015-11-02 12:43:20 -05:00
Aidan Feldman
b24913bb5e Merge remote-tracking branch 'origin/gh-pages' into content-B 2015-11-02 12:35:14 -05:00
Waldir Pimenta
b2eed043eb make sidebar template match the new format of the 'using' list 2015-11-02 16:36:55 +00:00
Waldir Pimenta
cd0c12225d format 'using' property as a bulleted list (fixes #292) 2015-11-02 16:36:55 +00:00