Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								6be33cf6ef 
								
							 
						 
						
							
							
								
								Merge pull request  #1492  from maul-esel/publishing  
							
							 
							
							
							
						 
						
							2014-04-14 20:17:01 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								91aa8e7637 
								
							 
						 
						
							
							
								
								We're not allowing custom data sources anymore.  
							
							 
							
							
							
						 
						
							2014-04-14 19:26:27 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								3f03c7a9d6 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2211  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-14 13:00:48 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								4f66db6c38 
								
							 
						 
						
							
							
								
								Merge pull request  #2211  from jekyll/pgp-key-header-frontmatter  
							
							 
							
							
							
						 
						
							2014-04-14 12:59:59 -04:00  
						
					 
				
					
						
							
							
								 
								Ben Balter
							
						 
						
							 
							
							
							
							
								
							
							
								658f418400 
								
							 
						 
						
							
							
								
								more explicit test description  
							
							 
							
							
							
						 
						
							2014-04-14 12:15:16 -04:00  
						
					 
				
					
						
							
							
								 
								Ben Balter
							
						 
						
							 
							
							
							
							
								
							
							
								b666ac787b 
								
							 
						 
						
							
							
								
								Stricter start of line check via \A  
							
							 
							
							
							
						 
						
							2014-04-11 15:15:37 -04:00  
						
					 
				
					
						
							
							
								 
								Ben Balter
							
						 
						
							 
							
							
							
							
								
							
							
								387cf2181a 
								
							 
						 
						
							
							
								
								use regex to verify yaml existence  
							
							 
							
							
							
						 
						
							2014-04-11 08:00:40 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								5068be3c27 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2216  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-08 09:00:59 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								02c668fa5d 
								
							 
						 
						
							
							
								
								Merge pull request  #2216  from szymzet/command-better-coverage  
							
							 
							
							
							
						 
						
							2014-04-08 09:00:31 -04:00  
						
					 
				
					
						
							
							
								 
								szymzet
							
						 
						
							 
							
							
							
							
								
							
							
								89b3bec1b0 
								
							 
						 
						
							
							
								
								Add missing Command tests  
							
							 
							
							
							
						 
						
							2014-04-08 11:32:53 +02:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								77d938065f 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2215  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-08 00:45:10 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								ecc6bbb028 
								
							 
						 
						
							
							
								
								Merge pull request  #2215  from jeffkole/page-collection-plugin  
							
							 
							
							
							
						 
						
							2014-04-08 00:44:46 -04:00  
						
					 
				
					
						
							
							
								 
								Jeff Kolesky
							
						 
						
							 
							
							
							
							
								
							
							
								09da544145 
								
							 
						 
						
							
							
								
								Adds reference to jekyll-page-collections plugin  
							
							 
							
							
							
						 
						
							2014-04-07 15:00:09 -07:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								2804e08908 
								
							 
						 
						
							
							
								
								delete old superfluous tests; extend feature  
							
							 
							
							
							
						 
						
							2014-04-07 16:22:04 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								1997281449 
								
							 
						 
						
							
							
								
								Add feature for the "--unsupported" flag  
							
							 
							
							... 
							
							
							
							Also make step definitions a little more generic. 
							
						 
						
							2014-04-07 16:22:04 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								46a5ab99f9 
								
							 
						 
						
							
							
								
								Support "published: false" for pages  
							
							 
							
							... 
							
							
							
							Fixes 1034. 
							
						 
						
							2014-04-07 16:22:04 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								3a330dc7fc 
								
							 
						 
						
							
							
								
								Use Publisher instead of Post#published?  
							
							 
							
							
							
						 
						
							2014-04-07 16:20:13 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								26663a6cf9 
								
							 
						 
						
							
							
								
								add the Publisher class to handle publishing logic  
							
							 
							
							
							
						 
						
							2014-04-07 16:17:51 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								91e9ecfa63 
								
							 
						 
						
							
							
								
								Add an --unpublished option to render unpublished posts  
							
							 
							
							... 
							
							
							
							Fixes  #1337 , #469 . 
							
						 
						
							2014-04-07 16:17:12 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								eded314bb1 
								
							 
						 
						
							
							
								
								add a cucumber feature to test "published" for pages  
							
							 
							
							
							
						 
						
							2014-04-07 16:13:20 +02:00  
						
					 
				
					
						
							
							
								 
								Ben Balter
							
						 
						
							 
							
							
							
							
								
							
							
								6c0f40385c 
								
							 
						 
						
							
							
								
								add test for PGP key yaml frontmatter  
							
							 
							
							
							
						 
						
							2014-04-06 16:03:19 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								75854b5d0b 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2214  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-06 13:37:06 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								b4a669ad76 
								
							 
						 
						
							
							
								
								Merge pull request  #2214  from stomar/file-exists  
							
							 
							
							
							
						 
						
							2014-04-06 13:36:46 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								5f2709b410 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2213  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-06 13:36:16 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								c345dcdbc4 
								
							 
						 
						
							
							
								
								Merge pull request  #2213  from XhmikosR/docs-favicon  
							
							 
							
							
							
						 
						
							2014-04-06 13:35:08 -04:00  
						
					 
				
					
						
							
							
								 
								Marcus Stollsteimer
							
						 
						
							 
							
							
							
							
								
							
							
								fec6b59950 
								
							 
						 
						
							
							
								
								Use File.exist? instead of deprecated File.exists?  
							
							 
							
							
							
						 
						
							2014-04-06 13:31:34 +02:00  
						
					 
				
					
						
							
							
								 
								XhmikosR
							
						 
						
							 
							
							
							
							
								
							
							
								e15fb54cc6 
								
							 
						 
						
							
							
								
								Slightly improve favicon.ico.  
							
							 
							
							... 
							
							
							
							Trim the whitespace so that the tube looks bigger while maintaining the aspect ratio. 
							
						 
						
							2014-04-06 09:17:14 +03:00  
						
					 
				
					
						
							
							
								 
								Ben Balter
							
						 
						
							 
							
							
							
							
								
							
							
								823c863a53 
								
							 
						 
						
							
							
								
								require newline after start of yaml header  
							
							 
							
							
							
						 
						
							2014-04-05 17:34:08 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								955dc38400 
								
							 
						 
						
							
							
								
								Deep merge data overrides into defaults.  
							
							 
							
							
							
						 
						
							2014-04-05 15:42:53 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								c0358cb7b4 
								
							 
						 
						
							
							
								
								Remove duplicate entry in list of third-party plugins ( #2206 )  
							
							 
							
							
							
						 
						
							2014-04-04 19:17:23 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								51bb98c03a 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2206  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-04 19:15:15 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								09c6ff4f9c 
								
							 
						 
						
							
							
								
								Post#published is no longer a thing.  
							
							 
							
							
							
						 
						
							2014-04-04 15:34:42 -04:00  
						
					 
				
					
						
							
							
								 
								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
							
						 
						
							 
							
							
							
							
								
							
							
								69a9ce214f 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2189  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-02 22:38:49 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								f3c54fcf50 
								
							 
						 
						
							
							
								
								Merge pull request  #2189  from benhanzl/move_rouge_loading  
							
							 
							
							
							
						 
						
							2014-04-02 22:38:05 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								a096f9af50 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2197  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-02 22:16:18 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								9ace48c835 
								
							 
						 
						
							
							
								
								Merge pull request  #2197  from jekyll/plugin-manager  
							
							 
							
							
							
						 
						
							2014-04-02 22:15:40 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								1863057b7e 
								
							 
						 
						
							
							
								
								Ok handle the plugins_path stuff in the PluginManager.  
							
							 
							
							
							
						 
						
							2014-04-02 22:06:38 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								4a4c8846f4 
								
							 
						 
						
							
							
								
								Fetching/determining the plugin path is beyond this it's kind of sad.  
							
							 
							
							
							
						 
						
							2014-04-02 21:59:15 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								0540a3351c 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1823  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-02 21:51:50 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								122b2233b1 
								
							 
						 
						
							
							
								
								Merge pull request  #1823  from jekyll/highlight-without-newline  
							
							 
							
							
							
						 
						
							2014-04-02 21:50:54 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								9fe22546be 
								
							 
						 
						
							
							
								
								Expect 41 posts, not just 40.  
							
							 
							
							
							
						 
						
							2014-04-02 15:10:28 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								795d240379 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2192  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-02 14:39:42 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								1437fb2621 
								
							 
						 
						
							
							
								
								Merge pull request  #2192  from XhmikosR/docs-feed  
							
							 
							
							
							
						 
						
							2014-04-02 14:39:04 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								8ccdee4035 
								
							 
						 
						
							
							
								
								STRIP ALL THE NEWLINES FROM HIGHLIGHTED CODE ok just the ones at the beginning and end  
							
							 
							
							
							
						 
						
							2014-04-02 14:37:22 -04:00  
						
					 
				
					
						
							
							
								 
								XhmikosR
							
						 
						
							 
							
							
							
							
								
							
							
								56f895db09 
								
							 
						 
						
							
							
								
								Add meta generator property in the HTML files.  
							
							 
							
							
							
						 
						
							2014-04-02 21:35:05 +03:00  
						
					 
				
					
						
							
							
								 
								XhmikosR
							
						 
						
							 
							
							
							
							
								
							
							
								e9a7eff13f 
								
							 
						 
						
							
							
								
								Improve feed.xml.  
							
							 
							
							... 
							
							
							
							* add `generator` property
* add image property
* use `xml_escape` instead of `![CDATA]`
* use `date_to_rfc822` instead of the date format string (thanks @troyswanson!)
* fix self reference url
* switch to `isPermaLink` for the `guid` 
							
						 
						
							2014-04-02 21:33:40 +03:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								2a3f0c0ec3 
								
							 
						 
						
							
							
								
								Strip content of the {% highlight %} block  
							
							 
							
							... 
							
							
							
							A fix for #1801  
							
						 
						
							2014-04-02 14:11:19 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								781e257298 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1568  [ci skip]  
							
							 
							
							
							
						 
						
							2014-04-02 14:10:33 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								806f43cdbc 
								
							 
						 
						
							
							
								
								Merge pull request  #1568  from nitoyon/url-escape  
							
							 
							
							
							
						 
						
							2014-04-02 14:09:09 -04:00