Commit Graph

2428 Commits

Author SHA1 Message Date
Parker Moore 146ce3d577 Merge pull request #1458 from dafi/patch-1
Fixed --layouts option
2013-08-26 13:58:56 -07:00
Davide Ficano 79ac2d6b53 Fixed --layouts option
The --layouts option isn't correctly declared causing a parse error when user specify it on command line
2013-08-26 17:19:32 +02:00
Matt Rogers 0b4ba4f771 Update history to reflect merge of #1454 2013-08-25 21:34:23 -05:00
Matt Rogers 044ec036dd Merge pull request #1454 from bdesham/fix-typos-in-history
Fix two typos in History.markdown
2013-08-25 19:33:34 -07:00
Benjamin Esham 56e2bdd0da Fix two typos in History.markdown 2013-08-25 13:05:52 -04:00
Matt Rogers 34e3dcdb9f Update history to reflect merge of #1443 2013-08-24 22:17:37 -05:00
Matt Rogers 4fa4ad2232 Merge pull request #1443 from ddavison/detachment
Detachment
2013-08-24 20:16:42 -07:00
ddavison b163bf637e final mods 2013-08-24 21:31:05 -04:00
Matt Rogers e50217a2ce Update history to reflect merge of #1444 2013-08-24 11:08:32 -05:00
Matt Rogers 1b40226cfd Merge pull request #1444 from chrisnicotera/master
Fix docs server options override
2013-08-24 09:07:33 -07:00
maul.esel 4c015fc5ff move Jekyll::Cleaner to Jekyll::Site::Cleaner 2013-08-23 20:42:27 +02:00
maul.esel dbd368f6ee remove no longer necessary condition 2013-08-23 20:41:13 +02:00
Parker Moore 07d23535af Update history to reflect the merge of #1430 2013-08-23 18:08:14 +02:00
Parker Moore 319a09ae61 Merge pull request #1430 from penibelst/site-speed
Update normalize.css to v2.1.2 and minify
2013-08-23 09:06:32 -07:00
Parker Moore 06bf97d332 Fix TypeError on Generation
After several page build fails, this seems to have fixed up the following error:

lib/jekyll/excerpt.rb:108:in `partition': type mismatch: NilClass given (TypeError)
2013-08-23 01:39:54 -04:00
ddavison aedac6060b adding new -B flag for -background- 2013-08-23 01:19:41 -04:00
Matt Rogers a91988d436 Update history to reflect merge of #1445 2013-08-22 11:11:16 -05:00
Matt Rogers 025535a7d1 Merge pull request #1445 from penibelst/patch-1
Add code tags
2013-08-22 09:10:04 -07:00
Christopher Nicotera 4b4103cc4a Use more efficient merge 2013-08-22 11:31:55 -04:00
Christopher Nicotera fb1003c06f Revert "Use more efficient merging"
This reverts commit 78df4ddb70.
2013-08-22 11:29:23 -04:00
Christopher Nicotera 78df4ddb70 Use more efficient merging 2013-08-22 11:27:30 -04:00
ddavison 8463e62d92 adding note about running detached 2013-08-22 13:45:06 +00:00
Anatol Broder aadf992616 Add code tags 2013-08-22 08:32:56 +02:00
Christopher Nicotera a721dae0a8 Fix docs server options override
Override the source and destination before passing it along to the
configuration
2013-08-21 23:53:30 -04:00
Parker Moore a3b63662ba Update history to reflect merge of #1439 2013-08-21 22:00:03 -04:00
Parker Moore 9bdc20ad24 Merge pull request #1439 from bdesham/pluralize-and-reading-time
Add "pluralize" and "reading_time" filters to docs
2013-08-21 18:59:20 -07:00
Parker Moore eeabdd7bec Update history to reflect merge of #1441 2013-08-21 21:53:02 -04:00
Parker Moore 20b28f0fa8 Merge pull request #1441 from sleeper/master
Fix a misleading typo
2013-08-21 18:51:54 -07:00
ddavison 8efcca9ddc adding documentation on using detach 2013-08-21 21:10:42 +00:00
Anatol Broder 148b3f5fdc Remove duplicate 2013-08-21 23:08:26 +02:00
Anatol Broder 7525324757 Add update_normalize_css task 2013-08-21 23:02:49 +02:00
ddavison 9681f3a776 adding default configuration to false 2013-08-21 21:00:18 +00:00
ddavison 4e52869f0f adding detachment functionality 2013-08-21 20:53:01 +00:00
Frederic ROS bca28056ef Fix a misleading typo 2013-08-21 14:53:10 +02:00
Benjamin Esham 1177cb6f54 Add "pluralize" and "reading_time" filters to docs 2013-08-20 20:57:15 -04:00
maul.esel d28858a9e9 put the Cleaner instance in a `Site#site_cleaner` method 2013-08-19 20:15:54 +02:00
maul.esel 0b3005b3b4 make obsolete_files a method (@mattr-) 2013-08-19 20:01:36 +02:00
Matt Rogers d40e7942c5 Update history to reflect merge of #1389 2013-08-18 10:59:11 -05:00
Matt Rogers 820f526569 Merge pull request #1389 from mojombo/doctor-conflicting-permalinks
Implement URL conflict checking in `jekyll-doctor`.
2013-08-18 08:57:49 -07:00
maul.esel 506cdc5179 include: more helpful error message for symlinks 2013-08-18 17:08:42 +02:00
Anatol Broder 854db4a7f8 Update normalize.css to v2.1.2 and minify 2013-08-18 14:23:06 +02:00
maul.esel 5d7dba476c change site_cleaner to use attr_accessor 2013-08-17 22:33:01 +02:00
Parker Moore 8b8fa4da4e Use Doctor#healthy? and ensure _all_ items are checked before process quits. 2013-08-17 15:16:14 -04:00
maul.esel 5da13d2b66 Refactor `Site#cleanup`
Move the cleanup logic out into a separate class,
`Jekyll::Cleaner`.
2013-08-17 17:14:08 +02:00
maul.esel 95719fa4ce improve error handling in include tag
* Reduce condition to one-liner
* Remove `self`
* Implicit return value
* Explicit error message for symlinks
2013-08-17 16:24:06 +02:00
Pat Hawks 32e55e7717 Use proper Ruby syntax for constant 2013-08-16 21:01:09 -07:00
Pat Hawks 2744b66fac Expose Jekyll version to templates
Make available `site.version` to liquid
2013-08-16 20:30:26 -07:00
Parker Moore ac4ca1edc3 Replace defunked mailing list link with info on IRC room. 2013-08-16 11:56:36 -04:00
Parker Moore 751ed0ab58 Update history to reflect fixing of #1424. 2013-08-16 11:56:07 -04:00
Parker Moore 6f933dc524 Fix link to contributing page in README. Fixes #1424. 2013-08-16 11:55:03 -04:00