jekyll/site
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
..
_data Merge master into sass 2014-01-24 12:17:35 -05:00
_includes Add meta generator property in the HTML files. 2014-04-02 21:35:05 +03:00
_layouts Less code than in commit c3b327dbe7 2014-04-01 17:45:02 +02:00
_posts Fix path sanitization example in post. Props @gregose 2014-03-28 12:52:56 -04:00
css Add comments and site.GH_ENV 2013-12-10 22:30:59 +01:00
docs Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults 2014-04-04 15:32:27 -04:00
img Improve feed.xml. 2014-04-02 21:33:40 +03:00
js Add respond.js so that media queries work in older IE too. 2014-03-27 07:45:44 +02:00
news Move news/releases/index.md to news/releases/index.html to prevent unnecessary <p> tags. #1508. 2013-09-06 23:00:36 -04:00
.gitignore Update site dir with contents of #583 at rev cb19367. 2012-12-31 12:48:04 -08:00
CNAME A better way to preview and release the Jekyll site. 2012-12-26 15:13:57 -07:00
README A better way to preview and release the Jekyll site. 2012-12-26 15:13:57 -07:00
_config.yml Add links to our lovely new Help repo 2014-03-27 19:14:11 -04:00
favicon.ico Switch to using an ico file. 2014-04-01 21:26:19 +03:00
feed.xml Improve feed.xml. 2014-04-02 21:33:40 +03:00
freenode.txt Add freenode verification file to jekyllrb.com. 2013-06-12 21:45:52 +02:00
index.html Specify image dimensions in the HTML. 2014-03-24 00:31:28 +02:00

README

Jekyll's awesome website.