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

701 Commits

Author SHA1 Message Date
Brandon Keepers
369bf42e8c Remove background image 2015-09-18 14:45:34 -04:00
Ben Balter
421f136c14 Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into gh-pages 2015-09-08 12:54:49 -04:00
Ben Balter
de0dfaf146 hard wrap 2015-09-08 12:54:14 -04:00
Ben Balter
2b0df6c6fd Merge pull request #266 from matt40k/gh-pages
MS Open Source licenses
2015-09-08 12:46:41 -04:00
Ben Balter
c94abf0f84 Merge branch 'gh-pages' into matt40k-gh-pages 2015-09-08 12:46:14 -04:00
Ben Balter
352284d5e8 Merge pull request #278 from github/clear-bsd
Add clear BSD
2015-09-08 12:44:06 -04:00
Ben Balter
1ddb0dc978 Merge branch 'gh-pages' of https://github.com/github/choosealicense.com into clear-bsd 2015-09-08 12:43:38 -04:00
Ben Balter
dba350e8dc Merge pull request #258 from waldyrious/sort-license-properties
Normalize sorting of license properties
2015-09-08 12:41:27 -04:00
Waldir Pimenta
f76e99330f Normalize sorting of license properties
Properties are now consistently sorted across all license files,
appearing in the following order:

**title**
nickname
tab-slug
redirect_from
category
variant
featured
hidden
**source**

**description**
**how**
note

using

**required**
**permitted**
**forbidden**
2015-09-06 18:59:27 +01:00
Matt Smith
b96a48f34e Add how, removed layout and permalink
Appears the spec has been updated - lets hope this sorts it
2015-09-01 23:29:59 +01:00
Matt Smith
7e5f27a9ef Merge remote-tracking branch 'github/gh-pages' into gh-pages 2015-09-01 23:17:10 +01:00
Matt Smith
d147b88cf1 Update ms-rl.txt 2015-09-01 23:14:42 +01:00
Matt Smith
54d48f0352 Update ms-pl.txt 2015-09-01 23:14:00 +01:00
Matt Smith
7258872c05 Update ms-rl.txt 2015-09-01 23:04:09 +01:00
Matt Smith
c2ebe9bfe7 Update ms-pl.txt 2015-09-01 23:03:20 +01:00
Ben Balter
38704df34c normalize metadata 2015-08-22 16:44:23 -04:00
Ben Balter
18ab25149b add bsd-3-clause-clear to whitelist 2015-08-22 16:41:42 -04:00
Ben Balter
3c8ca513cd Merge branch 'gh-pages' into clear-bsd 2015-08-22 16:41:05 -04:00
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 4b536ab4174a542dbfac7ee180d17349bf84d25d.
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