2c0b3b33d9 
								
							 
						 
						
							
							
								
								Merge branch 'message-for-yaml-error' of  https://github.com/stereobooster/jekyll  into stereobooster-message-for-yaml-error  
							
							
							
						 
						
							2012-12-31 13:25:05 -08:00  
				
					
						
							
							
								 
						
							
								a6c79396ab 
								
							 
						 
						
							
							
								
								Merge pull request  #699  from nitoyon/0-12-0-history  
							
							... 
							
							
							
							Add pull request #569  to history 
							
						 
						
							2012-12-31 13:11:16 -08:00  
				
					
						
							
							
								 
						
							
								43216ac629 
								
							 
						 
						
							
							
								
								Make sure we do not forget to merge  #583  in the future.  
							
							
							
						 
						
							2012-12-31 13:10:15 -08:00  
				
					
						
							
							
								 
						
							
								00d979759e 
								
							 
						 
						
							
							
								
								Update history.  
							
							
							
						 
						
							2012-12-31 13:01:40 -08:00  
				
					
						
							
							
								 
						
							
								cc73f04eb7 
								
							 
						 
						
							
							
								
								Update site dir with contents of  #583  at rev cb19367.  
							
							... 
							
							
							
							This is the big site redesign by @cobyism. To work with the new
site deployment mechanism, it is being copied from the gh-pages
branch of that PR into the existing site dir. Before we finally
deploy the new site, we should remember to merge #583  so that we
keep all the history from that PR. 
							
						 
						
							2012-12-31 12:48:04 -08:00  
				
					
						
							
							
								 
						
							
								62c8ba089a 
								
							 
						 
						
							
							
								
								Update history.  
							
							
							
						 
						
							2012-12-31 12:18:03 -08:00  
				
					
						
							
							
								 
						
							
								da096f307b 
								
							 
						 
						
							
							
								
								Add testcases for YAML syntax error and non UTF-8 encoding  
							
							
							
						 
						
							2012-12-30 02:39:02 +02:00  
				
					
						
							
							
								 
						
							
								83b3b2a340 
								
							 
						 
						
							
							
								
								More robust site:publish.  
							
							
							
						 
						
							2012-12-29 16:24:26 -08:00  
				
					
						
							
							
								 
						
							
								95b07a3c2b 
								
							 
						 
						
							
							
								
								Use Launchy for cross platform site:preview. Thx @ixti.  
							
							
							
						 
						
							2012-12-29 15:29:56 -08:00  
				
					
						
							
							
								 
						
							
								a5a6900948 
								
							 
						 
						
							
							
								
								fix error for case with broken encoding  
							
							
							
						 
						
							2012-12-30 00:07:21 +02:00  
				
					
						
							
							
								 
						
							
								2dbce8ca9f 
								
							 
						 
						
							
							
								
								fix error for case with wrong encoding or error in YAML  
							
							
							
						 
						
							2012-12-29 23:32:34 +02:00  
				
					
						
							
							
								 
						
							
								88bdb15338 
								
							 
						 
						
							
							
								
								Add site namespace and rename site preview/publish rake tasks.  
							
							
							
						 
						
							2012-12-28 16:09:42 -06:00  
				
					
						
							
							
								 
						
							
								6c02483255 
								
							 
						 
						
							
							
								
								Do not copy _site dir to gh-pages dir on release.  
							
							
							
						 
						
							2012-12-26 15:42:39 -07:00  
				
					
						
							
							
								 
						
							
								708ae28d8a 
								
							 
						 
						
							
							
								
								A better way to preview and release the Jekyll site.  
							
							
							
						 
						
							2012-12-26 15:13:57 -07:00  
				
					
						
							
							
								 
						
							
								b56a2d1ab1 
								
							 
						 
						
							
							
								
								Update history.  
							
							
							
						 
						
							2012-12-26 14:21:22 -07:00  
				
					
						
							
							
								 
						
							
								c23302f4fa 
								
							 
						 
						
							
							
								
								Merge branch 'deletion_protection' of  https://github.com/jasonroelofs/jekyll  into jasonroelofs-deletion_protection  
							
							
							
						 
						
							2012-12-26 14:02:41 -07:00  
				
					
						
							
							
								 
						
							
								6a78eb9f5b 
								
							 
						 
						
							
							
								
								Add pull request  #569  to history  
							
							
							
						 
						
							2012-12-24 00:43:06 +09:00  
				
					
						
							
							
								 
						
							
								d58a0c1088 
								
							 
						 
						
							
							
								
								Release 0.12.0  
							
							
							
						 
						
							2012-12-22 16:46:30 -07:00  
				
					
						
							
							
								 
						
							
								ffc68bdd48 
								
							 
						 
						
							
							
								
								Update history.  
							
							
							
						 
						
							2012-12-15 22:21:25 -08:00  
				
					
						
							
							
								 
						
							
								3a8ebb4b71 
								
							 
						 
						
							
							
								
								Merge branch 'fix/front-matter-regexp' of  https://github.com/zimbatm/jekyll  into zimbatm-fix/front-matter-regexp  
							
							
							
						 
						
							2012-12-15 22:09:41 -08:00  
				
					
						
							
							
								 
						
							
								22f4b12836 
								
							 
						 
						
							
							
								
								Clean up default config spec.  
							
							
							
						 
						
							2012-12-15 22:09:21 -08:00  
				
					
						
							
							
								 
						
							
								583f9e0019 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/Neil-Smithline/jekyll  into Neil-Smithline-master  
							
							
							
						 
						
							2012-12-15 16:42:26 -08:00  
				
					
						
							
							
								 
						
							
								e8d68551af 
								
							 
						 
						
							
							
								
								Update history.  
							
							
							
						 
						
							2012-12-15 16:38:20 -08:00  
				
					
						
							
							
								 
						
							
								26f8d60542 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/wbrady/jekyll  into wbrady-master  
							
							
							
						 
						
							2012-12-15 16:35:45 -08:00  
				
					
						
							
							
								 
						
							
								0b62b37122 
								
							 
						 
						
							
							
								
								Remove newline to fix failing Redcarpet test.  
							
							
							
						 
						
							2012-12-15 16:34:32 -08:00  
				
					
						
							
							
								 
						
							
								db96a88cee 
								
							 
						 
						
							
							
								
								Update history.  
							
							
							
						 
						
							2012-12-15 14:25:37 -08:00  
				
					
						
							
							
								 
						
							
								098da3d3fa 
								
							 
						 
						
							
							
								
								Merge branch 'redcarpet-update' of  https://github.com/tombell/jekyll  into tombell-redcarpet-update  
							
							
							
						 
						
							2012-12-15 14:09:55 -08:00  
				
					
						
							
							
								 
						
							
								5b5341ff9f 
								
							 
						 
						
							
							
								
								Merge pull request  #683  from petedmarsh/master  
							
							... 
							
							
							
							Add license to gemspec 
							
						 
						
							2012-12-15 11:25:17 -08:00  
				
					
						
							
							
								 
						
							
								a2dd4bf203 
								
							 
						 
						
							
							
								
								Add license to gemspec  
							
							
							
						 
						
							2012-12-07 15:24:33 +00:00  
				
					
						
							
							
								 
						
							
								38ac55381b 
								
							 
						 
						
							
							
								
								Only pass first class to Pygments  
							
							... 
							
							
							
							This prevents an exception if something like the following is used:
~~~ {foo bar}
some code
~~~ 
							
						 
						
							2012-11-13 07:59:36 +00:00  
				
					
						
							
							
								 
						
							
								a78b587e25 
								
							 
						 
						
							
							
								
								Update pygments.rb version  
							
							
							
						 
						
							2012-11-13 07:54:53 +00:00  
				
					
						
							
							
								 
						
							
								336ea66983 
								
							 
						 
						
							
							
								
								Better error reporting on Liquid exceptions  
							
							
							
						 
						
							2012-08-14 17:35:41 -04:00  
				
					
						
							
							
								 
						
							
								7f706f47fc 
								
							 
						 
						
							
							
								
								Update redcarpet support to version 2  
							
							
							
						 
						
							2012-08-13 15:03:33 +01:00  
				
					
						
							
							
								 
						
							
								3904fd9257 
								
							 
						 
						
							
							
								
								make yaml parsing errors more informative  
							
							
							
						 
						
							2012-06-29 12:08:57 -04:00  
				
					
						
							
							
								 
						
							
								fa8400ab61 
								
							 
						 
						
							
							
								
								Merge pull request  #574  from tombell/remove-rbx-travisci  
							
							... 
							
							
							
							Update travis-ci configuration file 
							
						 
						
							2012-06-11 16:53:45 -07:00  
				
					
						
							
							
								 
						
							
								49a4be44cd 
								
							 
						 
						
							
							
								
								Update travis-ci configuration file  
							
							
							
						 
						
							2012-06-12 00:35:21 +01:00  
				
					
						
							
							
								 
						
							
								ee402dd18a 
								
							 
						 
						
							
							
								
								Merge branch 'switch-to-pygmentsrb' of  https://github.com/tombell/jekyll  into tombell-switch-to-pygmentsrb  
							
							
							
						 
						
							2012-06-11 15:53:44 -07:00  
				
					
						
							
							
								 
						
							
								88428a8eb1 
								
							 
						 
						
							
							
								
								Merge pull request  #568  from tombell/travis-ci  
							
							... 
							
							
							
							Add travis-ci configuration file 
							
						 
						
							2012-06-11 15:52:58 -07:00  
				
					
						
							
							
								 
						
							
								202894c196 
								
							 
						 
						
							
							
								
								Merge branch 'custom-layout-directory' of  https://github.com/tombell/jekyll  into tombell-custom-layout-directory  
							
							... 
							
							
							
							Conflicts:
	lib/jekyll/site.rb 
							
						 
						
							2012-06-11 15:40:22 -07:00  
				
					
						
							
							
								 
						
							
								47090ffd2a 
								
							 
						 
						
							
							
								
								Fix up a few TomDocs.  
							
							
							
						 
						
							2012-06-06 11:59:49 -07:00  
				
					
						
							
							
								 
						
							
								0e9e7fbc85 
								
							 
						 
						
							
							
								
								Simplify Site#read_layouts.  
							
							
							
						 
						
							2012-06-06 11:59:49 -07:00  
				
					
						
							
							
								 
						
							
								58654176de 
								
							 
						 
						
							
							
								
								No longer need pygments locally  
							
							
							
						 
						
							2012-05-31 16:06:49 -04:00  
				
					
						
							
							
								 
						
							
								b2a1d61c04 
								
							 
						 
						
							
							
								
								Swap out albino for pygments.rb  
							
							
							
						 
						
							2012-05-31 15:51:34 -04:00  
				
					
						
							
							
								 
						
							
								c71d7d5290 
								
							 
						 
						
							
							
								
								Add travis-ci configuration file  
							
							... 
							
							
							
							* Tests against: 1.9.3, 1.9.2, 1.8.7, rbx-18mode
* Fixes  #387  
							
						 
						
							2012-05-31 14:55:16 -04:00  
				
					
						
							
							
								 
						
							
								df2ad2ac59 
								
							 
						 
						
							
							
								
								Allow a custom 'layouts' directory  
							
							... 
							
							
							
							* Add 'layouts' option to change the dir from '_layouts' to anything relative
  to the source directory
* Add cucumber scenario for testing an alternative directory '_theme'
* Closes  #563  
							
						 
						
							2012-05-30 21:39:43 -04:00  
				
					
						
							
							
								 
						
							
								da4e8f2ee1 
								
							 
						 
						
							
							
								
								Front-matter should be at start of file  
							
							... 
							
							
							
							It's the theme of the moment ; regexp checking.
Just in case we have two line start with --- in the file, we want to
make sure it's not interpreted as a front-matter. 
							
						 
						
							2012-05-25 18:59:26 +01:00  
				
					
						
							
							
								 
						
							
								7d88f72409 
								
							 
						 
						
							
							
								
								avoiding to call site_payload one time per each post and page. Speed site creation up of a 20%.  
							
							
							
						 
						
							2012-04-29 00:27:11 -07:00  
				
					
						
							
							
								 
						
							
								305695398c 
								
							 
						 
						
							
							
								
								Update History.  
							
							
							
						 
						
							2012-04-23 17:23:11 -07:00  
				
					
						
							
							
								 
						
							
								4533e60489 
								
							 
						 
						
							
							
								
								Merge branch 'master' of  https://github.com/daneharrigan/jekyll  into daneharrigan-master  
							
							... 
							
							
							
							Conflicts:
	lib/jekyll.rb 
							
						 
						
							2012-04-23 16:48:18 -07:00  
				
					
						
							
							
								 
						
							
								8a0fbf02f5 
								
							 
						 
						
							
							
								
								Cleanup for RDiscount TOC support.  Closes   #333 .  
							
							
							
						 
						
							2012-04-23 16:15:55 -07:00