1236 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ben Balter	16ae83ada5	Merge branch 'gh-pages' into clear-bsd	2015-08-22 16:40:07 -04:00
Ben Balter	d4230b322f	Merge pull request #283 from github/meta-cleanup ... License meta cleanup	2015-08-22 15:47:04 -04:00
Ben Balter	df0fd9213f	add rules spec	2015-08-22 15:42:12 -04:00
Ben Balter	26493bff3c	whitespace	2015-08-22 15:34:28 -04:00
Ben Balter	9b5db8a656	Merge branch 'gh-pages' into meta-cleanup	2015-08-22 15:33:46 -04:00
Ben Balter	2a1ebb049d	Merge pull request #282 from github/no-osi-approval ... Remove OSI approval requirement from tests	2015-08-22 15:33:34 -04:00
Ben Balter	ceb1a12158	rename to license_category	2015-08-22 15:27:15 -04:00
Ben Balter	915c08b821	move meta and fields to yaml	2015-08-22 15:25:16 -04:00
Ben Balter	8c63910daa	formalize whitelist	2015-08-22 12:41:30 -04:00
Ben Balter	2029405007	Revert "remove OSI appoval requirement" ... This reverts commit 4b536ab417.	2015-08-22 12:36:56 -04:00
Ben Balter	4b536ab417	remove OSI appoval requirement	2015-08-19 17:30:11 -04:00
Ben Balter	fdbaf19d51	Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into gh-pages	2015-08-19 16:46:46 -04:00
Ben Balter	5c47718e72	fix up wtfpl;	2015-08-19 16:46:40 -04:00
Ben Balter	2ba855c9e3	Merge branch 'gh-pages' into clear-bsd	2015-08-19 16:28:04 -04:00
Ben Balter	f121f637db	Merge pull request #280 from github/hidden-license-list ... Smarter license list filtering	2015-08-19 16:27:24 -04:00
Ben Balter	7601d76816	smart license list filtering	2015-08-19 16:25:47 -04:00
Ben Balter	f96e71d8d1	Merge pull request #279 from github/fix-ofl ... Fix OFL license meta	2015-08-19 16:25:00 -04:00
Ben Balter	ca7c100e2a	fix ofl title	2015-08-19 16:23:55 -04:00
Ben Balter	c9bf0edc20	rename ofl so tests pass	2015-08-19 16:23:48 -04:00
Ben Balter	a6110b62e4	fix ofl title	2015-08-19 16:19:59 -04:00
Ben Balter	d37cb1e96b	rename ofl so tests pass	2015-08-19 16:19:37 -04:00
Ben Balter	5b224fbf9a	add clear BSD	2015-08-19 16:14:26 -04:00
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