Haacked
4ce71929ad
Merged master
2013-11-18 15:06:19 -08:00
Haacked
94389c5873
Implement license family tabs
2013-11-18 14:48:32 -08:00
Phil Haack
342dadfa6e
Merge pull request #132 from engelnyst/cc0
...
CC0 fallback license is non sublicensable
2013-11-17 13:21:20 -08:00
enyst
4c2fa2692d
CC0 fallback license is non sublicensable.
...
(cf. https://creativecommons.org/publicdomain/zero/1.0/legalcode )
Signed-off-by: enyst <engel.nyst@gmail.com>
2013-11-17 00:12:34 +02:00
Jason Long
f28894d905
made partial for license overview sections
2013-11-06 11:24:34 -05:00
Jason Long
246cbc8d65
pill nav for license variations
2013-11-06 10:10:48 -05:00
Phil Haack
26b54fc2dc
Merge pull request #125 from JoshData/rename-public-domain
...
"Public Domain" is not the name of a license, the title of "Unlicense" should be something else
2013-11-05 20:24:18 -08:00
Phil Haack
ed62ede7f1
Merge pull request #126 from JoshData/cc0
...
Add CC0 as a license
2013-11-05 20:16:58 -08:00
Joshua Tauberer
3fa2799c40
rewrap to 78 characters, per #126 and #74
2013-11-05 19:04:20 -05:00
Jason Long
a9f1de32ae
pulled family name and description out of table
2013-11-05 14:22:51 -05:00
Joshua Tauberer
2cfb8588a1
add cc0 license
2013-11-05 13:35:44 -05:00
Joshua Tauberer
60edf7316d
'Public Domain' is not the name of a license; the Unlicense should at the least be called 'Public Domain Dedication', and the permalink should be called 'unlicense' to distinguish it from other methods of making a public domain dedication
2013-11-05 13:09:45 -05:00
Phil Haack
d9e59db626
Merge pull request #122 from derks/issue74
...
Resolves Issue #74 - Redo
2013-10-31 17:11:02 -07:00
BJ Dierkes
5e487d06a7
Resolves Issue #74
2013-10-31 17:29:24 -05:00
Phil Haack
ebffc7c11d
Merge pull request #117 from XhmikosR/updates
...
Updates
2013-10-30 13:19:04 -07:00
XhmikosR
156d6575ac
about.md: remove unneeded html entities.
2013-10-30 20:46:21 +02:00
XhmikosR
892e9e341a
Ignore coffee file.
2013-10-30 20:39:55 +02:00
XhmikosR
c1c291b379
Use double quotes consistently.
2013-10-30 20:39:55 +02:00
XhmikosR
e805e5365f
Fix validation error.
2013-10-30 20:39:55 +02:00
XhmikosR
19a96450c0
HTML5 cleanup.
...
* remove type for css and js since they're the defaults
* remove chrome=1 from X-UA-Compatible since it's become obsolete
* use the protocol relative URL for the google font
2013-10-30 20:39:55 +02:00
XhmikosR
6042281d6d
Update selectivizr to v1.0.3b.
2013-10-30 20:34:52 +02:00
XhmikosR
a931ed19eb
Update modernizr to v2.6.2.
2013-10-30 20:34:52 +02:00
XhmikosR
46f4a5901a
Update ZeroClipboard to v1.2.1.
2013-10-30 20:34:52 +02:00
XhmikosR
81f3bc1eb7
Update jquery.qtip to v2.1.1.
...
Also use the minified css.
2013-10-30 20:34:52 +02:00
XhmikosR
eccbe2438b
Update jquery to v1.10.2.
2013-10-30 20:34:52 +02:00
XhmikosR
d1ae44f146
Remove trailing spaces.
2013-10-30 20:34:52 +02:00
Phil Haack
bcbca2ba46
Merge pull request #116 from XhmikosR/images
...
Compress images.
2013-10-30 11:25:31 -07:00
XhmikosR
5484dafc5b
Compress images.
2013-10-30 19:51:56 +02:00
Phil Haack
c364b0eeb0
Merge pull request #115 from github/haacked/private-use-fix
...
Add private-use to every license
2013-10-30 10:40:40 -07:00
Haacked
64097df8f0
Add private-use to every license
...
There is no license that prohibits private use.
2013-10-30 10:10:02 -07:00
Ben Balter
880ec82d3c
bump gemfile
2013-10-30 10:55:01 -04:00
Phil Haack
40a2b5cbad
Merge pull request #78 from engelnyst/artistic
...
Artistic license is not copyleft
2013-10-28 17:17:17 -07:00
Phil Haack
544d8f45c8
Merge pull request #71 from weakish/gh-pages
...
make notations of no-license more coherent
2013-10-28 17:09:18 -07:00
Haacked
95d34dc9bd
Group licenses together
2013-10-28 16:48:57 -07:00
Phil Haack
bb0906b575
Merge pull request #110 from github/tekkub-patch-1
...
Kill email notifications
2013-10-27 18:05:05 -07:00
Tekkub
b0797771e1
Kill email notifications
2013-10-27 18:12:30 -06:00
Phil Haack
7ec8e0630f
Merge pull request #103 from IQAndreas/fix-artistic-license-formatting
...
Use the plaintext formatting of the Artistic License 2.0
2013-10-23 19:21:55 -07:00
Andreas Renberg (IQAndreas)
1e50a84d47
Add fields for year and fullname
...
See
https://github.com/github/choosealicense.com/pull/103#issuecomment-26914863
2013-10-24 02:53:20 +02:00
Ben Balter
13e73e8682
Merge pull request #108 from github/gjtorikian-patch-1
...
Add AddALicense.com
2013-10-23 15:19:11 -07:00
Garen Torikian
383f0dbb83
Add AddALicense.com
2013-10-23 14:56:31 -07:00
Aidan Feldman
677674114b
fix indentation of projects using Eclipse
2013-10-23 09:43:11 -07:00
Aidan Feldman
1aaa72baae
Merge branch 'gh-pages' of github.com:waynebeaton/choosealicense.com into waynebeaton-gh-pages
2013-10-23 09:41:35 -07:00
Aidan Feldman
96bff79ddc
Merge pull request #104 from github/html-proofer
...
Set up HTML::Proofer
2013-10-23 09:31:58 -07:00
Aidan Feldman
31177b66b8
Merge pull request #102 from github/fix-using
...
Fix 'using' display in sidebar
2013-10-23 09:31:48 -07:00
Aidan Feldman
44341c5bc7
Merge pull request #106 from github/tools
...
Include list of tools
2013-10-23 09:12:38 -07:00
Aidan Feldman
cd4c3ae9b7
Merge pull request #105 from github/build-status
...
Build gh-pages branch
2013-10-23 09:12:25 -07:00
Aidan Feldman
6a028997c4
include list of tools
2013-10-23 00:56:24 -07:00
Aidan Feldman
d967bf06a7
display build status in readme
2013-10-23 00:37:21 -07:00
Aidan Feldman
27ff916e91
build gh-pages branch on travis
2013-10-23 00:37:09 -07:00
Aidan Feldman
08bba211da
make testing instructions match travis build steps
2013-10-23 00:28:50 -07:00
