Commit Graph

9 Commits

Author SHA1 Message Date
Parker Moore 6bd07501e8 Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults
* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
  move self.type to convertible
  oops, fix minor indentation quirk
  document frontmatter defaults precedence
  adjust frontmatter defaults precedence handling
  change cucumber feature to test for precedence too
  fix frontmatter defaults for custom paths
  more robust cucumber features
  fix slash handling for paths
  move cucumber features to own file
  fix minor docs quirk
  improve path checking, now using Pathname instead of regex
  Add site documentation for the new feature
  add inline code docs
  improve validation code
  fix for Ruby 1.8
  Add basic cucumber features for frontmatter defaults
  Retrieve frontmatter defaults when retrieved internally
  make frontmatter defaults available to liquid
  add a class `FrontmatterDefaults` for handling of frontmatter defaults
  Add a method to retrieve type to post, page and draft

Conflicts:
	lib/jekyll.rb
	lib/jekyll/convertible.rb
	lib/jekyll/core_ext.rb
	lib/jekyll/page.rb
	lib/jekyll/post.rb
2014-04-04 15:32:27 -04:00
Parker Moore 12fcdd9bfa Some beginning collection for Windows users.
Leaving the office so it's a bit unkempt.
2013-11-18 15:12:21 -05:00
maul.esel 1cb67932f6 fix minor docs quirk 2013-09-16 15:46:15 +02:00
maul.esel 8060cb60a2 Add site documentation for the new feature 2013-09-11 18:39:59 +02:00
Anatol Broder 00285411eb Update curly apostrophes 2013-08-13 22:56:04 +02:00
Anatol Broder d7b5c40901 Correct internal links 2013-08-11 15:09:23 +02:00
m 4efaaa8232 Add a Pro Tip to docs about front matter variables being optional 2013-06-03 11:07:35 -05:00
Parker Moore 628f8280d0 Merge benbalter:docs-pages #985 2013-05-10 22:11:36 +02:00
Benjamin J. Balter e1f04968e8 Use pages for documentation, not posts, fixes #980. 2013-04-18 10:10:59 -04:00