Commit Graph

3911 Commits

Author SHA1 Message Date
Parker Moore 9df239f2fd Update history to reflect the closing of #2339. 2014-05-07 15:59:27 -04:00
Parker Moore 348bcae763 If the input is a string but Time.parse can't parse it, maybe it's a UNIX timestamp.
Fixes #2339
2014-05-07 15:48:13 -04:00
Parker Moore a6af5e26bc Require mercenary v0.3.3 or greater (below v0.4.0) 2014-05-07 15:36:54 -04:00
Parker Moore 23a9db1e4d Update history to reflect the closing of #2324. 2014-05-07 15:12:45 -04:00
Parker Moore 77c0249d72 Use site.title instead of site.name in site template
Fixes #2324.
2014-05-07 15:11:50 -04:00
Parker Moore daaae974b3 Update site history. 2014-05-07 15:11:22 -04:00
Parker Moore 60f8f1477c Update history to reflect merge of #2337 [ci skip] 2014-05-07 15:01:34 -04:00
Parker Moore fba56f2601 Merge pull request #2337 from sankage/grammar-slam 2014-05-07 15:01:14 -04:00
Parker Moore 8f0146c564 Update history to reflect fixing of #2334. 2014-05-07 15:00:30 -04:00
Parker Moore f2f2ebfa4f Register subclasses of subclasses of Jekyll::Plugin
The Sass and SCSS converters are practically the same – only different in
the input syntax and file extension. As such, we've created
`Jekyll::Converters::Scss` which is a subclass of `Jekyll::Converter`, and
`Jekyll::Converters::Sass` which is a subclass of
`Jekyll::Converters::Scss`. When `Site#instantiate_classes` is called on
`Jekyll::Converter`, it only instantiates the `Scss` converter, not the
`Sass` converter. This change fixes that.

Fixes #2334.
2014-05-07 14:59:08 -04:00
David Briggs cdb46f03f7 add missing 'as' 2014-05-07 14:53:55 -04:00
Parker Moore 0022e5a67e Update history to reflect the closing of #2325. 2014-05-07 14:02:18 -04:00
Parker Moore 8ad4dd332a Don't fail if any of the path objects are nil.
Fixes #2325
2014-05-07 14:01:36 -04:00
Parker Moore 8e5392e9d9 Update history to reflect merge of #2331 [ci skip] 2014-05-07 13:36:44 -04:00
Parker Moore ac220ad38a Merge pull request #2331 from albertogg/fix-site-template-permalink 2014-05-07 13:34:49 -04:00
Alberto Grespan da9b28d35c Fix site template permalink typo 2014-05-07 11:36:14 -04:30
Parker Moore 000880837e Update history to reflect merge of #2326 [ci skip] 2014-05-07 11:21:43 -04:00
Parker Moore 06bcd411d8 Merge pull request #2326 from iamgabeortiz/master 2014-05-07 11:20:40 -04:00
Gabe Ortiz 31ee99ea3e Merge pull request #1 from iamgabeortiz/gist.rb-doc-update
Update gist.rb comments only
2014-05-07 07:39:16 -04:00
Gabe Ortiz 21f84e1548 Update gist.rb comments only
Strictly updated the reference to Examples and Valid Syntax to be inline with jekyll/jekyll-help#32
2014-05-07 07:34:00 -04:00
Parker Moore 0614d2f966 Update history conversion so it works from MD ~> Website 2014-05-07 00:47:15 -04:00
Parker Moore 47649066b5 Remove unneeded method from Rakefile. 2014-05-07 00:44:20 -04:00
Parker Moore 8aadecf3ff Fix header for 2.0.2 so it's written to the website. 2014-05-07 00:43:21 -04:00
Parker Moore e6a750204a Update history to reflect merge of #2319 [ci skip] 2014-05-07 00:39:58 -04:00
Parker Moore 0905b2c1e4 Merge pull request #2319 from jekyll/use-urls 2014-05-07 00:39:35 -04:00
Parker Moore 216f1150cd The last of the site template prepending. 2014-05-07 00:31:53 -04:00
Parker Moore c71a4717dd Prepend url, too, in feed.xml. 2014-05-07 00:09:12 -04:00
Parker Moore ac666490d2 Release 2.0.2 2014-05-06 23:59:49 -04:00
Parker Moore 3cc439a1cc Update history to reflect merge of #2316 [ci skip] 2014-05-06 23:57:53 -04:00
Parker Moore 92eaf42cad Merge pull request #2316 from holic/master 2014-05-06 23:57:28 -04:00
Parker Moore 97e9fb29b0 Default baseurl to "" rather than to "/"
Also a fix for #2317
2014-05-06 23:54:56 -04:00
Parker Moore 832860bcb5 Update history to reflect the fixing of #2317 2014-05-06 23:52:03 -04:00
Parker Moore 2dec333910 Set baseurl to nothing in new template site.
Previously, it caused all sorts of errors.
Fixes #2317.
2014-05-06 23:50:58 -04:00
Kevin Ingersoll 3498cc9947 Add a little clarity to docs 2014-05-07 14:48:35 +12:00
Parker Moore b5dc628357 Update history to reflect merge of #2314 [ci skip] 2014-05-06 22:40:15 -04:00
Parker Moore 0fc990423b Merge pull request #2314 from troyswanson/gist-docs 2014-05-06 22:39:35 -04:00
Troy Swanson 0dffe26cfe Update docs for different gist behavior 2014-05-06 21:25:34 -05:00
Parker Moore 0a0d7858c6 Release 2.0.1 2014-05-06 21:57:33 -04:00
Parker Moore 64cce065e6 Require kramdown instead of maruku.
CRAP CRAP CRAP whoops.
2014-05-06 21:55:11 -04:00
Parker Moore 25b5651f9d Add some Google Analytics magic. 2014-05-06 21:31:05 -04:00
Parker Moore d4bc707ba0 Release 2.0.0 2014-05-06 21:22:48 -04:00
Parker Moore 759ffb7b53 Merge pull request #2312 from jekyll/release-2.0.0 2014-05-06 21:20:53 -04:00
Parker Moore 0a5ca5aaf0 Rename 2.0.0 release post to match title. [ci skip] 2014-05-06 21:13:43 -04:00
Parker Moore 41b69d6c8a A year ago to the day. [ci skip] 2014-05-06 21:12:59 -04:00
Parker Moore aef2134128 Remove unneeded tests for the sass converter plugin. 2014-05-06 21:09:51 -04:00
Parker Moore 13f19ea21a Update histories to reflect 2.0.0 release. 2014-05-06 21:06:27 -04:00
Parker Moore 344906deb9 Release 2.0.0. 2014-05-06 20:11:44 -04:00
Matt Rogers e7e67ad235 Update history to reflect merge of #2299 [ci skip] 2014-05-06 16:49:44 -05:00
Matt Rogers 5c109ee8dc Merge pull request #2299 from penibelst/sort-nils 2014-05-06 16:49:40 -05:00
Anatol Broder 1e0d9f899b Follow Ruby Styleguide 2014-05-06 22:49:49 +02:00