d0d143452a 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/laumann/jekyll  
							
							
							
						 
						
							2012-01-15 20:39:55 -08:00  
				
					
						
							
							
								 
						
							
								c14eb346a3 
								
							 
						 
						
							
							
								
								Allow [+.#-] in highlight lang shortnames.  Fixes   #282 .  
							
							
							
						 
						
							2012-01-15 20:35:09 -08:00  
				
					
						
							
							
								 
						
							
								89180169a4 
								
							 
						 
						
							
							
								
								Merge branch 'include' of  https://github.com/lukebayes/jekyll  into lukebayes-include  
							
							... 
							
							
							
							Conflicts:
	lib/jekyll.rb
	lib/jekyll/site.rb 
							
						 
						
							2012-01-14 19:48:04 -08:00  
				
					
						
							
							
								 
						
							
								d80c773b01 
								
							 
						 
						
							
							
								
								New solution for passing restrictions to RedCloth - all tests pass with ruby 1.8 (just invoking rake)  
							
							
							
						 
						
							2011-11-28 14:05:34 +01:00  
				
					
						
							
							
								 
						
							
								69e7f4abef 
								
							 
						 
						
							
							
								
								Add test cases for default values with no explicit config. for `hard_breaks`.  
							
							
							
						 
						
							2011-11-03 11:54:49 -07:00  
				
					
						
							
							
								 
						
							
								fccb6c7f74 
								
							 
						 
						
							
							
								
								Merge git://github.com/mojombo/jekyll  
							
							
							
						 
						
							2011-06-29 12:07:21 +02:00  
				
					
						
							
							
								 
						
							
								851172b5ef 
								
							 
						 
						
							
							
								
								Replace rdiscount filter with config-aware markdownify.  
							
							
							
						 
						
							2011-05-31 14:40:21 -07:00  
				
					
						
							
							
								 
						
							
								cae0eaf19c 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'mjschultz/master'  
							
							... 
							
							
							
							Conflicts:
	lib/jekyll/filters.rb 
							
						 
						
							2011-05-30 12:27:11 -07:00  
				
					
						
							
							
								 
						
							
								da9930657e 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'derekprior/configurable_coverter_file_extensions'  
							
							
							
						 
						
							2011-05-30 11:38:59 -07:00  
				
					
						
							
							
								 
						
							
								2ad0fbc8ff 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'MattHall/redcarpet'  
							
							
							
						 
						
							2011-05-29 21:38:34 -07:00  
				
					
						
							
							
								 
						
							
								20d1bd1f10 
								
							 
						 
						
							
							
								
								Merge  https://github.com/mojombo/jekyll  
							
							
							
						 
						
							2011-05-09 12:01:17 +02:00  
				
					
						
							
							
								 
						
							
								6a31e650f3 
								
							 
						 
						
							
							
								
								Tests and specs run under 1.9.  
							
							
							
						 
						
							2011-04-24 18:39:27 +08:00  
				
					
						
							
							
								 
						
							
								093a5efbe1 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'jbw/ruby-v1.9' into devel  
							
							
							
						 
						
							2011-04-23 18:08:34 +08:00  
				
					
						
							
							
								 
						
							
								cf779b2760 
								
							 
						 
						
							
							
								
								Added Redcarpet for MD conversion  
							
							
							
						 
						
							2011-04-20 10:04:42 +01:00  
				
					
						
							
							
								 
						
							
								d2377b2581 
								
							 
						 
						
							
							
								
								Fixed mistake in default markdown extensions  
							
							
							
						 
						
							2011-04-12 17:30:56 -04:00  
				
					
						
							
							
								 
						
							
								5801220a98 
								
							 
						 
						
							
							
								
								Added the ability to configure the file extensions to be processed by each converter. Test cases included.  
							
							
							
						 
						
							2011-04-12 17:03:28 -04:00  
				
					
						
							
							
								 
						
							
								3f889ef077 
								
							 
						 
						
							
							
								
								added test case to hard_breaks (disable/enable in _config.yml)  
							
							
							
						 
						
							2011-03-23 18:17:14 +01:00  
				
					
						
							
							
								 
						
							
								dce4ccc5a4 
								
							 
						 
						
							
							
								
								Better error message for invalid post date.  
							
							
							
						 
						
							2011-03-11 17:52:25 -08:00  
				
					
						
							
							
								 
						
							
								9e3ad69922 
								
							 
						 
						
							
							
								
								- added rdiscount filter for templating system (like the textilize filter, but for markdown)  
							
							
							
						 
						
							2011-03-03 08:14:52 -06:00  
				
					
						
							
							
								 
						
							
								717a2540e1 
								
							 
						 
						
							
							
								
								Added support for 'include' configuration parameter. This parameter  
							
							... 
							
							
							
							should work just like 'exclude', except it gives us the ability
to enumerate any files that should not be ignored - even if they
begin with the dastardly dot or underscore. 
							
						 
						
							2010-12-30 16:41:34 -08:00  
				
					
						
							
							
								 
						
							
								5b680f8dd8 
								
							 
						 
						
							
							
								
								remove orphaned files in destination  
							
							
							
						 
						
							2010-12-01 18:04:50 +01:00  
				
					
						
							
							
								 
						
							
								61acd47ed2 
								
							 
						 
						
							
							
								
								Merge remote branch 'jasongraham/kramdown-support'  
							
							
							
						 
						
							2010-11-22 19:26:58 -08:00  
				
					
						
							
							
								 
						
							
								f85e229a9e 
								
							 
						 
						
							
							
								
								Add support for kramdown HTML converter options  
							
							... 
							
							
							
							http://kramdown.rubyforge.org/converter/html.html#options 
  Example: In the _config.yaml,
  markdown: kramdown
  kramdown:
    auto_ids: true 
						
							2010-11-20 17:40:27 -08:00  
				
					
						
							
							
								 
						
							
								ac7a0cc95f 
								
							 
						 
						
							
							
								
								Add Kramdown support and tests  
							
							
							
						 
						
							2010-11-20 17:40:27 -08:00  
				
					
						
							
							
								 
						
							
								f7ab019a39 
								
							 
						 
						
							
							
								
								Merge remote branch 'claco/uri-escape'  
							
							
							
						 
						
							2010-11-17 15:30:34 -06:00  
				
					
						
							
							
								 
						
							
								4afee1bda1 
								
							 
						 
						
							
							
								
								Merge remote branch 'jlecour/master'  
							
							... 
							
							
							
							Conflicts:
	lib/jekyll/page.rb 
							
						 
						
							2010-11-17 15:25:55 -06:00  
				
					
						
							
							
								 
						
							
								054b796b9f 
								
							 
						 
						
							
							
								
								Merge remote branch 'cblunt/limit_posts'  
							
							
							
						 
						
							2010-11-17 14:56:32 -06:00  
				
					
						
							
							
								 
						
							
								4c08643c50 
								
							 
						 
						
							
							
								
								Added uri_escape for cases where cgi_escape isn't appropriate  
							
							
							
						 
						
							2010-11-12 11:15:30 -05:00  
				
					
						
							
							
								 
						
							
								f688c9df81 
								
							 
						 
						
							
							
								
								Added limit-posts option to site configuration.  
							
							... 
							
							
							
							* Added unit tests for limit-posts.
  * Added feature for limit-posts.
  * Added --limit_posts option to bin/jekyll options parser 
							
						 
						
							2010-09-13 00:31:52 +01:00  
				
					
						
							
							
								 
						
							
								16c19ecd19 
								
							 
						 
						
							
							
								
								Add a failing test for rendering dotfiles  
							
							... 
							
							
							
							The test uses a simple ".htaccess" file that needs to be rendered
as any other page, like the sitemap.xml, … 
							
						 
						
							2010-09-09 09:37:51 +02:00  
				
					
						
							
							
								 
						
							
								b1049c84cd 
								
							 
						 
						
							
							
								
								Correctly generates file basename.  Fixes   #208 .  
							
							... 
							
							
							
							The previous procedure generated invalid basenames when the filename had
more than one dot. 
							
						 
						
							2010-09-05 18:11:09 -03:00  
				
					
						
							
							
								 
						
							
								de7e0011f9 
								
							 
						 
						
							
							
								
								Add some colouring to the unit tests.  
							
							
							
						 
						
							2010-08-31 03:41:00 +01:00  
				
					
						
							
							
								 
						
							
								dc7a7d0090 
								
							 
						 
						
							
							
								
								Updated for 1.9 encoding support.  
							
							
							
						 
						
							2010-08-30 23:03:04 +01:00  
				
					
						
							
							
								 
						
							
								4aae2a7bc7 
								
							 
						 
						
							
							
								
								RedGreen is broken in 1.9.2. Test::Unit has colouring ability now.  
							
							
							
						 
						
							2010-08-30 22:57:13 +01:00  
				
					
						
							
							
								 
						
							
								e53a5407b9 
								
							 
						 
						
							
							
								
								Test::Unit is no longer ships with Ruby.  
							
							
							
						 
						
							2010-08-30 22:55:39 +01:00  
				
					
						
							
							
								 
						
							
								e054202c2b 
								
							 
						 
						
							
							
								
								fix load errors in ruby 1.9.2.  
							
							
							
						 
						
							2010-08-30 22:35:15 +01:00  
				
					
						
							
							
								 
						
							
								391d1a9677 
								
							 
						 
						
							
							
								
								Merge remote branch 'ctrochalakis/rdiscount_extensions'  
							
							
							
						 
						
							2010-08-24 15:19:47 -07:00  
				
					
						
							
							
								 
						
							
								d9bc00c804 
								
							 
						 
						
							
							
								
								Highlight should not be able to render local files.  
							
							
							
						 
						
							2010-08-24 15:05:28 -07:00  
				
					
						
							
							
								 
						
							
								a56eeb8289 
								
							 
						 
						
							
							
								
								Add support for rdiscount extensions  
							
							... 
							
							
							
							Specify extensions at your _config.yml file:
    ...
    rdiscount:
        extensions: [smart, autolink]
Available extensions can be found here:
http://rdoc.info/projects/rtomayko/rdiscount 
closes  #173  
							
						 
						
							2010-06-25 16:38:45 +03:00  
				
					
						
							
							
								 
						
							
								f8484570b7 
								
							 
						 
						
							
							
								
								Merge remote branch 'christianhellsten/master' into next  
							
							
							
						 
						
							2010-06-22 16:01:48 -07:00  
				
					
						
							
							
								 
						
							
								de8bd48154 
								
							 
						 
						
							
							
								
								Maruku is now the only processor dependency installed by default.  Closes   #57 .  
							
							... 
							
							
							
							Other processors will be lazy-loaded when necessary (and prompt the
user to install them when necessary). 
							
						 
						
							2010-06-22 15:17:39 -07:00  
				
					
						
							
							
								 
						
							
								46a95bc036 
								
							 
						 
						
							
							
								
								git merge mojombo/master  
							
							
							
						 
						
							2010-06-22 15:42:51 +03:00  
				
					
						
							
							
								 
						
							
								f91954be76 
								
							 
						 
						
							
							
								
								optimization: write static file to the destination only if source file timestamp differs  
							
							... 
							
							
							
							Also make sure static files get regenerated when they are missing in destination.
This is useful in --server --auto mode when it reduces disk/cpu load and also plays nice with xrefresh-server (which was my main motivation) -> soft CSS refresh works again! 
							
						 
						
							2010-06-20 08:02:16 +02:00  
				
					
						
							
							
								 
						
							
								5335debfb2 
								
							 
						 
						
							
							
								
								Merge remote branch 'technoweenie/no-leading-zeroes'  
							
							... 
							
							
							
							Conflicts:
	lib/jekyll/post.rb 
							
						 
						
							2010-06-18 15:34:56 -07:00  
				
					
						
							
							
								 
						
							
								f6ef6f21ae 
								
							 
						 
						
							
							
								
								whitespace  
							
							
							
						 
						
							2010-06-03 16:09:33 -07:00  
				
					
						
							
							
								 
						
							
								e8d119ef0a 
								
							 
						 
						
							
							
								
								add :i_day and :i_month permalink values so you can get urls like /2010/6/1/title  
							
							
							
						 
						
							2010-05-31 23:28:39 -07:00  
				
					
						
							
							
								 
						
							
								84b26a31da 
								
							 
						 
						
							
							
								
								removed use of content_type strings in the highlighting tag  
							
							
							
						 
						
							2010-02-28 00:11:43 +00:00  
				
					
						
							
							
								 
						
							
								cedda3afa3 
								
							 
						 
						
							
							
								
								move converters to classes  
							
							
							
						 
						
							2010-02-27 22:14:27 +00:00  
				
					
						
							
							
								 
						
							
								80b13a81fa 
								
							 
						 
						
							
							
								
								added usage of site.html_pages to test source sitemap.xml  
							
							
							
						 
						
							2010-02-27 14:11:06 +00:00  
				
					
						
							
							
								 
						
							
								cd946a587b 
								
							 
						 
						
							
							
								
								removed tabs and made into a better example for sitemap times  
							
							
							
						 
						
							2010-02-26 22:07:26 +00:00