10c2445003 
								
							 
						 
						
							
							
								
								Merge pull request  #966  from benbalter/quick-start-scaffold  
							
							... 
							
							
							
							Update quickstart instructions with `new` command 
							
						 
						
							2013-04-13 11:38:56 -07:00  
				
					
						
							
							
								 
						
							
								f69a716d93 
								
							 
						 
						
							
							
								
								Update quickstart instructions with `new` command  
							
							... 
							
							
							
							Quickstart instructions as written would serve an empty directory.
They instruct the user to install Jekyll (:metal), `cd` to a directory that may not exist, and then run `jekyll serve` (:hurtrealbad:).
Instead, lets have them run `jekyll new` to stand up a scaffold site, so they can see how things work and poke around a bit.
It's one more command, but IMHO a better user experience for someone just getting started. 
							
						 
						
							2013-04-13 14:09:58 -04:00  
				
					
						
							
							
								 
						
							
								cef0a80897 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #961  
							
							
							
						 
						
							2013-04-13 19:27:21 +02:00  
				
					
						
							
							
								 
						
							
								9b5ebb874f 
								
							 
						 
						
							
							
								
								Merge pull request  #961  from benbalter/default-markdown-engine  
							
							... 
							
							
							
							Move template site to default markdown renderer 
							
						 
						
							2013-04-13 10:26:34 -07:00  
				
					
						
							
							
								 
						
							
								3e04655025 
								
							 
						 
						
							
							
								
								Merge pull request  #962  from dracula2000/refactor-site  
							
							... 
							
							
							
							Move defaults found in site.rb to DEFAULTS Hash 
							
						 
						
							2013-04-13 10:24:35 -07:00  
				
					
						
							
							
								 
						
							
								485b37e3d1 
								
							 
						 
						
							
							
								
								move template site to default markdown renderer  
							
							
							
						 
						
							2013-04-13 12:41:03 -04:00  
				
					
						
							
							
								 
						
							
								028e580bb8 
								
							 
						 
						
							
							
								
								Remove short-circuits from Site  
							
							
							
						 
						
							2013-04-13 12:39:49 -04:00  
				
					
						
							
							
								 
						
							
								e7815d873c 
								
							 
						 
						
							
							
								
								Add implicit defaults to DEFAULTS  
							
							
							
						 
						
							2013-04-13 12:37:38 -04:00  
				
					
						
							
							
								 
						
							
								dcad4b2867 
								
							 
						 
						
							
							
								
								Merge pull request  #956  from jhauraw/doc-var-excerpt  
							
							... 
							
							
							
							Add 'excerpt' page variable to Docs Variables page. 
							
						 
						
							2013-04-13 07:19:46 -07:00  
				
					
						
							
							
								 
						
							
								891ccbd656 
								
							 
						 
						
							
							
								
								Merge pull request  #953  from mojombo/refactor-configuration  
							
							... 
							
							
							
							Refactor Jekyll Configuration 
							
						 
						
							2013-04-13 07:19:03 -07:00  
				
					
						
							
							
								 
						
							
								48bb29c1f7 
								
							 
						 
						
							
							
								
								Moved 'excerpt' var below 'title'.  
							
							
							
						 
						
							2013-04-12 18:26:29 -07:00  
				
					
						
							
							
								 
						
							
								73a1ffd77a 
								
							 
						 
						
							
							
								
								Add 'excerpt' page variable to Docs Variables page.  
							
							
							
						 
						
							2013-04-12 17:42:48 -07:00  
				
					
						
							
							
								 
						
							
								47653381b1 
								
							 
						 
						
							
							
								
								Merge pull request  #954  from maul-esel/liquid-override-path  
							
							... 
							
							
							
							Allow overriding "path" in YAML frontmatter 
							
						 
						
							2013-04-12 15:16:11 -07:00  
				
					
						
							
							
								 
						
							
								c20fc03604 
								
							 
						 
						
							
							
								
								add cucumber tests for overriding path  
							
							
							
						 
						
							2013-04-13 00:06:09 +02:00  
				
					
						
							
							
								 
						
							
								968f3b0911 
								
							 
						 
						
							
							
								
								allow overriding page.path in YAML frontmatter  
							
							
							
						 
						
							2013-04-13 00:05:49 +02:00  
				
					
						
							
							
								 
						
							
								6881d3bfbf 
								
							 
						 
						
							
							
								
								Refactored Configuration#config_files  
							
							
							
						 
						
							2013-04-12 23:59:37 +02:00  
				
					
						
							
							
								 
						
							
								b44cf939e6 
								
							 
						 
						
							
							
								
								Add note in docs about page.path.  #951 .  
							
							
							
						 
						
							2013-04-12 23:43:25 +02:00  
				
					
						
							
							
								 
						
							
								dc39f02132 
								
							 
						 
						
							
							
								
								Add new pagination variables to the Variables page in the docs site.  #942  
							
							
							
						 
						
							2013-04-12 23:39:20 +02:00  
				
					
						
							
							
								 
						
							
								65f0d66e39 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #951  
							
							
							
						 
						
							2013-04-12 23:34:34 +02:00  
				
					
						
							
							
								 
						
							
								92db4ed89f 
								
							 
						 
						
							
							
								
								Merge pull request  #951  from maul-esel/liquid-file-path  
							
							... 
							
							
							
							Expose file path to Liquid 
							
						 
						
							2013-04-12 14:33:19 -07:00  
				
					
						
							
							
								 
						
							
								bd8d271ce3 
								
							 
						 
						
							
							
								
								Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr-  
							
							
							
						 
						
							2013-04-12 23:11:38 +02:00  
				
					
						
							
							
								 
						
							
								0f600a322c 
								
							 
						 
						
							
							
								
								Added a unit test for Configuration#backwards_compatibilize  
							
							
							
						 
						
							2013-04-12 22:42:54 +02:00  
				
					
						
							
							
								 
						
							
								7c7bacffe7 
								
							 
						 
						
							
							
								
								Refactor setup block for test of Configuration#config_files  
							
							
							
						 
						
							2013-04-12 22:37:01 +02:00  
				
					
						
							
							
								 
						
							
								25a882fa75 
								
							 
						 
						
							
							
								
								Merge pull request  #952  from mojombo/refactor-commands  
							
							... 
							
							
							
							Remove code duplication in Build command 
							
						 
						
							2013-04-12 13:36:19 -07:00  
				
					
						
							
							
								 
						
							
								879b08a0b0 
								
							 
						 
						
							
							
								
								In Configuration#config_files, cascade to the Configuration's value of 'source' before the default  
							
							
							
						 
						
							2013-04-12 22:29:52 +02:00  
				
					
						
							
							
								 
						
							
								0812c1b4c9 
								
							 
						 
						
							
							
								
								Add unit tests for Configuration#config_files  
							
							
							
						 
						
							2013-04-12 22:29:27 +02:00  
				
					
						
							
							
								 
						
							
								0c0b13e69b 
								
							 
						 
						
							
							
								
								Unit test for Configuration#stringify_keys  
							
							
							
						 
						
							2013-04-12 21:56:45 +02:00  
				
					
						
							
							
								 
						
							
								f2f20d18f0 
								
							 
						 
						
							
							
								
								TomDoc Jekyll::Configuration  
							
							
							
						 
						
							2013-04-12 21:38:30 +02:00  
				
					
						
							
							
								 
						
							
								810a29c719 
								
							 
						 
						
							
							
								
								Rescue the entire method instead of just a `begin` block  
							
							
							
						 
						
							2013-04-12 22:25:58 +03:00  
				
					
						
							
							
								 
						
							
								e2967c96cd 
								
							 
						 
						
							
							
								
								Jekyll.configuration should use the new Jekyll::Configuration class  
							
							
							
						 
						
							2013-04-12 21:20:30 +02:00  
				
					
						
							
							
								 
						
							
								64f224933b 
								
							 
						 
						
							
							
								
								Add Jekyll::Configuration  
							
							
							
						 
						
							2013-04-12 21:20:14 +02:00  
				
					
						
							
							
								 
						
							
								04fd68a232 
								
							 
						 
						
							
							
								
								Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS  
							
							
							
						 
						
							2013-04-12 21:19:20 +02:00  
				
					
						
							
							
								 
						
							
								0884a52fea 
								
							 
						 
						
							
							
								
								Add TomDoc for Jekyll::Command.process_site  
							
							
							
						 
						
							2013-04-12 20:01:25 +02:00  
				
					
						
							
							
								 
						
							
								5f54507204 
								
							 
						 
						
							
							
								
								Remove code duplication  
							
							
							
						 
						
							2013-04-12 19:35:46 +02:00  
				
					
						
							
							
								 
						
							
								5a92a73010 
								
							 
						 
						
							
							
								
								add cucumber tests for page.path variable  
							
							
							
						 
						
							2013-04-12 18:18:17 +02:00  
				
					
						
							
							
								 
						
							
								dc4d7c0bf4 
								
							 
						 
						
							
							
								
								fix path for posts: must include "_posts"  
							
							
							
						 
						
							2013-04-12 18:17:57 +02:00  
				
					
						
							
							
								 
						
							
								d64fd1e8fe 
								
							 
						 
						
							
							
								
								expose file path relative to source dir to liquid  
							
							... 
							
							
							
							Fixes  #633 . 
						
							2013-04-12 17:37:16 +02:00  
				
					
						
							
							
								 
						
							
								5c680db758 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #946 .  
							
							
							
						 
						
							2013-04-12 15:42:09 +02:00  
				
					
						
							
							
								 
						
							
								bee8cd9d77 
								
							 
						 
						
							
							
								
								Merge pull request  #946  from maul-esel/preserve_excerpt  
							
							... 
							
							
							
							Preserve 'excerpt` in YAML Front-Matter 
							
						 
						
							2013-04-12 06:24:51 -07:00  
				
					
						
							
							
								 
						
							
								64aa31b3d3 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #945  
							
							
							
						 
						
							2013-04-12 15:20:55 +02:00  
				
					
						
							
							
								 
						
							
								17c1e23203 
								
							 
						 
						
							
							
								
								Merge pull request  #945  from voidfiles/master  
							
							... 
							
							
							
							Accept multiple config files from command line 
							
						 
						
							2013-04-12 06:19:55 -07:00  
				
					
						
							
							
								 
						
							
								2b238786a2 
								
							 
						 
						
							
							
								
								one more indentation fix  
							
							
							
						 
						
							2013-04-12 12:05:07 +02:00  
				
					
						
							
							
								 
						
							
								bcda51f97b 
								
							 
						 
						
							
							
								
								do not allow markdown etc. in excerpt  
							
							... 
							
							
							
							Adjust the tests accordingly. Also
add a message for one of the tests. 
							
						 
						
							2013-04-11 21:02:08 +02:00  
				
					
						
							
							
								 
						
							
								b10e06ce47 
								
							 
						 
						
							
							
								
								new test: ensure the correct excerpt is exposed to liquid  
							
							... 
							
							
							
							Also shorten test code a little bit. 
							
						 
						
							2013-04-11 19:33:32 +02:00  
				
					
						
							
							
								 
						
							
								14a669530e 
								
							 
						 
						
							
							
								
								Fixing tests, and making it more ruby friendly  
							
							
							
						 
						
							2013-04-11 10:17:59 -07:00  
				
					
						
							
							
								 
						
							
								951ee09a75 
								
							 
						 
						
							
							
								
								remove useless attr_reader for excerpt (is a method now)  
							
							
							
						 
						
							2013-04-11 19:05:28 +02:00  
				
					
						
							
							
								 
						
							
								654d598fcf 
								
							 
						 
						
							
							
								
								rework excerpt to be an accessor method  
							
							... 
							
							
							
							Instead of setting self.excerpt, make it a method
that returns either the custom excerpt or the pre-
viously extracted excerpt. 
							
						 
						
							2013-04-11 17:13:15 +02:00  
				
					
						
							
							
								 
						
							
								2792e1e427 
								
							 
						 
						
							
							
								
								fix indentation of test  
							
							
							
						 
						
							2013-04-11 16:51:48 +02:00  
				
					
						
							
							
								 
						
							
								0113fea7a1 
								
							 
						 
						
							
							
								
								Add tests for using custom excerpt  
							
							
							
						 
						
							2013-04-11 14:26:20 +02:00  
				
					
						
							
							
								 
						
							
								069e70d1b3 
								
							 
						 
						
							
							
								
								do not override custom excerpt set in YAML frontmatter  
							
							... 
							
							
							
							Fixes  #933 . 
						
							2013-04-11 14:25:47 +02:00