Commit Graph

4447 Commits

Author SHA1 Message Date
Paul Annesley 0f30aca76a Build status badge in README refers to master branch.
Otherwise, experimental branches being pushed can cause the badge
in the README (master branch, GitHub front page) to show the build
failing.
2013-10-16 12:54:25 -07:00
Matt Rogers 61e6a834cb Update history to reflect merge of #1635 2013-10-16 10:10:28 -05:00
Matt Rogers 6cdb7ec833 Merge pull request #1635 from dpassage/patch-1
Fix grammar in usage.md
2013-10-16 08:09:19 -07:00
David Paschich c017174dad Fix grammar in usage.md 2013-10-16 07:47:18 -07:00
maul.esel 2b275ef192 oops, fix minor indentation quirk 2013-10-15 14:38:45 +02:00
maul.esel 96a37ac1ab document frontmatter defaults precedence 2013-10-15 14:25:47 +02:00
maul.esel dd851943c0 adjust frontmatter defaults precedence handling
Before, the bottom-most default set had highest precedence. Instead,
now the set with a longer i.e. more specific path has precedence and
sets with a type setting have precedence over those without one. In
case of equal precedence the bottom-most still wins.
2013-10-15 14:18:44 +02:00
maul.esel 32b4de3ea6 change cucumber feature to test for precedence too 2013-10-15 13:32:49 +02:00
maul.esel 20ea0c8d56 Merge branch 'master' into frontmatter-defaults 2013-10-14 19:44:06 +02:00
maul.esel 699eeba9f0 fix frontmatter defaults for custom paths
The Page#path or Post#path can be overriden by by a frontmatter
setting. This causes path-based frontmatter default detection to
fail. Add test to demonstrate this and fix it.
2013-10-14 19:16:53 +02:00
maul.esel 1c52657d7d more robust cucumber features 2013-10-14 19:13:20 +02:00
maul.esel 67a451ea84 fix slash handling for paths 2013-10-14 18:43:12 +02:00
maul.esel 8091029329 move cucumber features to own file 2013-10-14 16:48:26 +02:00
Parker Moore 6f7935857a Update history to reflect merge of #1626 2013-10-11 15:35:25 +00:00
Parker Moore 0ffd4ff603 Merge pull request #1626 from albertogg/migrations-warning-note
jekyll-import warning note of missing deps.
2013-10-11 08:33:24 -07:00
albertogg 65df20ac10 Fix typos. 2013-10-10 21:21:37 -04:30
Matt Rogers 976cddf477 Update history to reflect merge of #1614 2013-10-10 20:49:55 -05:00
Matt Rogers 441b6d68c2 Update history to reflect merge of #1615 2013-10-10 20:48:27 -05:00
Matt Rogers 0761769dda Merge pull request #1615 from benbalter/downcase-lexers
Downcase lexers before passing to Pygments
2013-10-10 18:48:00 -07:00
Matt Rogers 110aeee9a2 Update history to reflect merge of #1622 2013-10-10 20:39:23 -05:00
Matt Rogers e3f6d860a2 Merge pull request #1622 from blackjid/master
enable the use of folders inside the _layout path
2013-10-10 18:38:42 -07:00
albertogg ac6f09752d requieres. 2013-10-10 16:35:04 -04:30
albertogg 222aad55e4 Show the complete name and no abbreviation. 2013-10-10 16:15:01 -04:30
albertogg c38f295f63 Fix typos. 2013-10-10 16:09:20 -04:30
albertogg c169ad26cd jekyll-import warning note of missing deps.
The jekyll-import gem, opted to leave out importer-specific runtime dependencies. I'm adding a warning note for the user to be aware of this and manually install the ones they need based on the importer they are using.
2013-10-10 13:48:17 -04:30
Juan Ignacio Donoso e141dfa03f Add cucumber feature for layouts inside subfolders 2013-10-08 18:14:13 -03:00
Juan Ignacio Donoso 87ef39aeb0 Add support for use of folders inside _layout path, closes #1622 2013-10-08 14:19:12 -03:00
Juan Ignacio Donoso 01f41a7cfc Add test to reflect #1622 behaviour 2013-10-08 14:17:56 -03:00
Ben Balter 9b0a7b3438 test for lexer case insensitivity 2013-10-06 16:06:20 -04:00
Ben Balter 844cc615e4 actually downcase lexer 2013-10-06 15:55:16 -04:00
Parker Moore 848a11b3a8 Update history to reflect merge of #1616 2013-10-05 20:38:09 -04:00
Parker Moore 75efbadbc9 Merge pull request #1616 from bricejlin/patch-1
clean up comments to be more concise/uniform
2013-10-05 17:36:18 -07:00
Brice 9ff245dbdb clean up comments to be more concise/uniform 2013-10-05 13:20:30 -04:00
Ben Balter d5f137bc86 downcase lexers before passing to Pygments 2013-10-05 11:26:26 -04:00
Parker Moore 694599645f Add in test plugin for inclusion. 2013-10-04 15:49:47 -04:00
Parker Moore 310688297b I guess we'll wait until v2.0 to switch to absolute permalinks. 2013-10-04 15:03:05 -04:00
Parker Moore bf1d9a79c4 Add support for gem-based plugins. 2013-10-04 14:45:28 -04:00
Parker Moore 41adc30667 Update history to reflect merge of #1602 2013-10-04 14:40:39 -04:00
Parker Moore e2b6b7d932 Merge pull request #1602 from sferik/update_safe_yaml_dependency
Update safe_yaml dependency to ~> 0.9.7
2013-10-04 11:39:05 -07:00
Erik Michaels-Ober cebb936e60 Update safe_yaml dependency to ~> 0.9.7 2013-10-04 19:52:55 +02:00
Parker Moore 55f4c3a0fd Update history to reflect merge of #1613 2013-10-04 13:37:11 -04:00
Parker Moore b850c01605 Merge pull request #1613 from maul-esel/fix-variable-include
fix error with variable as file name
2013-10-04 10:36:26 -07:00
maul.esel b00849544b fix error with variable as file name 2013-10-04 19:12:29 +02:00
Parker Moore 04c0c2d0bb Don't post to IRC unless it's really important. 2013-10-04 12:58:58 -04:00
Parker Moore 06a757f156 Update history to reflect merge of #1610 2013-10-04 12:31:22 -04:00
Parker Moore 68306c691a Merge pull request #1610 from sferik/update_kramdown_dependency
Update kramdown dependency to ~> 1.2
2013-10-04 09:30:41 -07:00
Parker Moore 31b6a930c4 Update history to reflect merge of #1603 2013-10-04 12:29:39 -04:00
Parker Moore 6b2561424a Merge pull request #1603 from sferik/update_rake_dependency
Update rake dependency to ~> 10.1
2013-10-04 09:29:12 -07:00
Parker Moore c32e317236 Update history to reflect merge of #1606 2013-10-04 12:28:56 -04:00
Parker Moore ddcb6e95f5 Merge pull request #1606 from sferik/update_coveralls_dependency
Update coveralls dependency to ~> 0.7.0
2013-10-04 09:28:30 -07:00