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
Aidan Feldman
d0f2cc3424
run html-proofing as part of travis build
2013-10-23 00:23:57 -07:00
Aidan Feldman
b5ff5db785
tweaks to make html-proofing pass
2013-10-23 00:20:44 -07:00
Aidan Feldman
0527976cee
add HTML::Proofer
2013-10-23 00:07:51 -07:00
Aidan Feldman
af62acc3f6
remove garbage 'using' link
2013-10-22 23:58:31 -07:00
Aidan Feldman
1b5debd6bf
fix 'using' display in sidebar
2013-10-22 23:58:31 -07:00
Andreas Renberg (IQAndreas)
c3f8ee7c88
Use the plaintext formatting of the Artistic License 2.0
...
Another case where the license was copied from HTML, but had a nicely
formatted plaintext version (this is the last one, I promise).
This time the source was taken from
<http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt >
2013-10-23 08:53:11 +02:00
Aidan Feldman
a5b5d4ade7
Merge pull request #101 from IQAndreas/fix-missing-sources
...
Add license sources where missing
2013-10-22 23:37:33 -07:00
Andreas Renberg (IQAndreas)
dc58abef62
Add license sources where missing
2013-10-23 08:09:55 +02:00
Andreas Renberg (IQAndreas)
800d8bbdb8
Only include link to source if one has been provided
...
Not all licenses have provided a `source` property, so this check just
prevent an empty `href` in such cases.
2013-10-23 07:37:32 +02:00
Phil Haack
686367b1e0
Merge pull request #99 from IQAndreas/fix-apache-formatting
...
Switch to use the plaintext formatting for Apache License
2013-10-22 09:00:52 -07:00
Andreas Renberg (IQAndreas)
f07c1f9beb
Change braces to match the rest of the site
2013-10-22 14:21:04 +02:00
Andreas Renberg (IQAndreas)
d2b1145e6d
Switch to use the plaintext formatting for Apache License
...
It's very clear that the site had copied over the HTML version of the
Apache License.
See [lines 122 to
142](4e2fd06748/licenses/apache.txt (L122)
)
as an example where the unordered list bullets not copied in along with
the rest of the text, throwing off the formatting and bunching together
text.
Since the site is displaying the plaintext version of the license, it
makes more sense to use the nicely formatted [plaintext version provided
by Apache](http://www.apache.org/licenses/LICENSE-2.0.txt ).
2013-10-22 14:14:30 +02:00
Wayne Beaton
bee7665b86
Updated the description and using statements in eclipse.txt
2013-10-17 13:59:11 -04:00
Jason Long
a75d9e1b0f
Merge pull request #94 from github/remove-callout-class
...
Remove unused callout class
2013-09-26 04:55:05 -07:00
Jason Long
02470e2452
removed unused callout class
2013-09-26 07:43:15 -04:00
Phil Haack
58272d537b
Merge pull request #93 from github/better-text-contrast
...
put license text in lighter container for better contrast
2013-09-25 09:01:20 -07:00
Jason Long
85755edd74
put license text in lighter container for better contrast
2013-09-25 08:58:07 -04:00
Aidan Feldman
1613f337d5
Merge pull request #56 from rohieb/gh-pages
...
Bring back the list bullets for BSD licenses
2013-09-16 13:51:53 -07:00
Aidan Feldman
abd17d181f
Merge pull request #77 from engelnyst/rephrase
...
Rephrase advice to consult a legal professional
2013-09-16 13:12:49 -07:00
Phil Haack
a5f4538c00
Merge pull request #89 from github/cc
...
Add FAQ re: non-code projects
2013-09-16 13:03:33 -07:00
Ben Balter
b2892098a0
tighten up index part deux copy
2013-09-16 15:47:27 -04:00
Aidan Feldman
f03c77d9fa
separate first and second row of homepage questions
2013-09-16 15:42:21 -04:00
Aidan Feldman
6e91d6b529
change text of second row homepage questions to be consistent with the first
2013-09-16 15:39:10 -04:00
Aidan Feldman
b4e302a73c
increase vertical spacing between homepage questions
2013-09-16 15:38:22 -04:00
Aidan Feldman
0177da529a
reorder homepage questions
2013-09-16 15:17:53 -04:00
Aidan Feldman
837cb3e1d2
reduce text in the homepage FAQ
2013-09-16 15:17:02 -04:00
Aidan Feldman
a47bbeea43
make the additinal homepage questions side-by-side
2013-09-16 15:16:10 -04:00
Aidan Feldman
be6def2b46
Merge remote-tracking branch 'origin/gh-pages' into cc
2013-09-16 14:35:43 -04:00
Aidan Feldman
a35e09a45b
Merge pull request #90 from github/resources
...
Include list of resources
2013-09-16 11:24:20 -07:00
Aidan Feldman
97a6446420
convert resource list to kramdown syntax
2013-09-16 14:21:19 -04:00
Aidan Feldman
972ae57106
Merge remote-tracking branch 'origin/gh-pages' into resources
2013-09-16 14:12:24 -04:00