1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 04:40:09 +01:00

862 Commits

Author SHA1 Message Date
Matt Smith
39eed4dccb Merge remote-tracking branch 'upstream/gh-pages' into gh-pages 2015-08-14 14:39:17 +01:00
Matt Smith
12adf39a19 Update ms-rl.txt 2015-08-14 14:33:08 +01:00
Matt Smith
9c7b036fcd Update ms-pl.txt 2015-08-14 14:32:07 +01:00
Ben Balter
ec3d0d1b7b Merge pull request #276 from github/no-api
Remove api
2015-08-10 18:59:06 -04:00
Ben Balter
357a0f0a2e Merge pull request #210 from Jell-E/gh-pages
Added the WTFPL licence
2015-08-10 15:28:48 -04:00
Ben Balter
d0999dde1f remove api 2015-08-07 11:36:02 -04:00
Ben Balter
3ed0867bb1 normalize license instructions 2015-08-07 11:35:27 -04:00
Ben Balter
f560cc5188 fix new license paths 2015-08-07 11:33:28 -04:00
Ben Balter
d321f922f6 Merge pull request #130 from davelab6/gh-pages
Adding OFL
2015-08-07 11:31:44 -04:00
Ben Balter
70ee496e15 Merge pull request #200 from derekjones/osl-3.0
Adding Open Software License 3.0
2015-08-07 11:30:18 -04:00
Ben Balter
bf2bc66c23 Merge pull request #274 from github/hidden-licenses
Hidden licenses
2015-08-07 10:50:19 -04:00
Jelle Besseling
ab3b0f395c Made it less explicit and moved to hidden category
By removing 'fuck' from the title, 'the fuck' from the license description and moving this license to the hidden section I hope it is now suitable for merging.
2015-08-07 13:31:05 +02:00
Derek Jones
2400f30551 updating OLS 3.0 usage examples 2015-08-06 10:32:44 -07:00
Derek Jones
828ea3fc45 adding hidden attribute to YAML front matter 2015-08-06 10:23:30 -07:00
Derek Jones
c30ff9e20a Merge remote-tracking branch 'github/gh-pages' into osl-3.0
Conflicts:
	_config.yml
2015-08-06 10:22:19 -07:00
Dave Crossland
4ce73c5ac0 ofl.txt: remove keys not needed 2015-08-06 12:35:53 -04:00
Dave Crossland
e1322446cc ofl.txt: Add hidden key 2015-08-06 12:15:46 -04:00
Dave Crossland
16e2562f77 ofl.txt: Add metadata, fix (c) notice template 2015-08-06 12:14:09 -04:00
Ben Balter
4ba1ca5dac implement hidden licenses 2015-08-06 11:56:18 -04:00
Ben Balter
c5a6c07d6f Merge pull request #267 from github/jdennes-fix-links
Fix broken links in CONTRIBUTING.md
2015-07-05 14:42:40 -04:00
James Dennes
2a93406d1b Fix broken links
There is no master branch. Make these links branch-agnostic.
2015-07-05 15:11:54 +02:00
Matt Smith
e2dc70b74f bugfix
Missed 'License' from name - SPDX compliance
2015-05-29 01:27:48 +01:00
Matt Smith
2f17a6af22 MS Open Source licenses
Add the the Microsoft Open Source licenses which are heavily used on
Codeplex
2015-05-29 01:10:58 +01:00
Ben Balter
c0ca64aae4 Merge pull request #247 from real-or-random/patch-1
Applying the LGPL v3 correctly
2015-04-28 12:05:46 -04:00
Ben Balter
ecda3577b3 Merge pull request #227 from shinnn/gh-pages
Change variable names of Google Analytics tracking code
2015-04-27 17:54:36 -04:00
Ben Balter
b2b1433043 Merge pull request #262 from lord63-forks/patch-1
Update  bsd-3-clause.txt
2015-04-27 17:47:52 -04:00
Brandon Keepers
b6ffbe7dfa Merge pull request #264 from Jitrixis/patch-1
Correct copyright year of LICENSE.md
2015-04-27 17:24:00 -04:00
Julien GARDET
c74b12323d Update LICENSE.md
Revert 435a5c4 ; has to be the first year of publication https://en.wikipedia.org/wiki/Copyright#Copyright_notices_in_the_United_States
2015-04-27 15:53:07 +02:00
Ben Balter
bb51e2898f Merge pull request #254 from github/scss
Use Sass
2015-04-19 10:10:58 +10:00
lord63
4908ddf1c1 Update bsd-3-clause.txt
Replace the not exist {organizetion} option with [project].
2015-04-06 11:30:45 +08:00
Brandon Keepers
917d6fc446 Merge pull request #256 from github/fix-gpl-alias
Fix GPL v3.0 nickname
2015-03-08 18:35:16 -07:00
Brandon Keepers
869573e054 Fix GPL v3.0 alias 2015-03-08 16:50:56 -07:00
Ben Balter
1058d71b2e use sass 2015-03-08 10:32:19 -04:00
Ben Balter
5d8a479b72 Merge pull request #253 from github/nicknames
Add license nicknames for license list
2015-03-07 16:47:29 -05:00
Ben Balter
0ca328b53a add nicknames for license list 2015-03-07 14:11:34 -05:00
Ben Balter
46de1939b5 Merge pull request #252 from github/tests
Add additional tests
2015-03-07 13:57:04 -05:00
Ben Balter
6bea81d1ca remove Gemfile.lock 2015-03-07 13:51:38 -05:00
Ben Balter
530e15d771 validate SPDX compliance 2015-03-07 13:38:52 -05:00
Ben Balter
18be645772 also check HTML 2015-03-07 12:58:57 -05:00
Ben Balter
e32971e277 Merge branch 'gh-pages' into tests 2015-03-07 12:55:39 -05:00
Ben Balter
4c01753eca Merge pull request #251 from github/descriptions
Add BSD-3 and AGPL descriptions
2015-03-07 12:55:27 -05:00
Ben Balter
8ddc331195 cache 2015-03-07 12:52:01 -05:00
Ben Balter
9c536b774b rake test should invoke rake spec 2015-03-07 12:49:49 -05:00
Ben Balter
dc1cc773a1 add tests 2015-03-07 12:47:24 -05:00
Ben Balter
79368c3197 its all about familiy 2015-03-05 20:30:15 -05:00
Ben Balter
54254c3f69 add descriptions to bsd-3 and agpl 2015-02-26 14:10:55 -05:00
Ben Balter
d865bf19c2 Merge pull request #249 from Voles/gh-pages
Update README.md
2015-02-05 09:16:38 -05:00
Niels Dequeker
fc001d6327 Update README.md
Make link clickable
2015-02-05 12:10:45 +01:00
Tim Ruffing
b20cc6035c Applying the LGPL v3 correctly
The LGPL v3 does not include the boilerplate notice. One should use a modified variant of the boilerplate notice at the end of GPL v3, see https://www.gnu.org/licenses/gpl-howto.en.html

> When using the Lesser GPL, insert the word “Lesser” before “General” in all three places. When using the GNU AGPL, insert the word “Affero” before “General” in all three places.
2015-01-17 14:24:45 +01:00
shinnn
9133e8d468 Change variable names of Google Analytics code
`i` `s` `o` `g` `r` `a` `m` -> `L` `I` `C` `e` `N` `C` `E`

It is generated by isogram.
https://github.com/shinnn/isogram
2015-01-15 01:56:23 +09:00