ef54bfe5a1 
								
							 
						 
						
							
							
								
								highlighting fix  
							
							
							
						 
						
							2015-01-21 17:44:28 +01:00  
				
					
						
							
							
								 
						
							
								cecd974d8e 
								
							 
						 
						
							
							
								
								Merge pull request  #3335  from jekyll/jekyll-meetup-address-fix  
							
							... 
							
							
							
							Fix Google Maps link to GitHub HQ in Jekyll meetup blog post 
							
						 
						
							2015-01-21 11:22:18 -05:00  
				
					
						
							
							
								 
						
							
								3be90c7822 
								
							 
						 
						
							
							
								
								🔧  Google Maps link to GitHub HQ  
							
							... 
							
							
							
							Address was pointing to "85" Colin P Kelly, but should be "88"
cc @alfredxing (good 👀 ) 
							
						 
						
							2015-01-21 10:57:24 -05:00  
				
					
						
							
							
								 
						
							
								d2c717c3c6 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #3332  [ci skip]  
							
							
							
						 
						
							2015-01-20 20:53:58 -08:00  
				
					
						
							
							
								 
						
							
								ef426cd490 
								
							 
						 
						
							
							
								
								Merge pull request  #3332  from jekyll/meetup  
							
							
							
						 
						
							2015-01-20 20:53:40 -08:00  
				
					
						
							
							
								 
						
							
								053ba68a15 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #3333  [ci skip]  
							
							
							
						 
						
							2015-01-20 20:53:22 -08:00  
				
					
						
							
							
								 
						
							
								51e2cb3629 
								
							 
						 
						
							
							
								
								Merge pull request  #3333  from digitalsparky/master  
							
							
							
						 
						
							2015-01-20 20:52:53 -08:00  
				
					
						
							
							
								 
						
							
								b951696114 
								
							 
						 
						
							
							
								
								add jekyll-minifier  
							
							
							
						 
						
							2015-01-21 12:38:45 +08:00  
				
					
						
							
							
								 
						
							
								5d750f5a71 
								
							 
						 
						
							
							
								
								Add a better link to GitHub HQ.  
							
							
							
						 
						
							2015-01-20 20:12:41 -08:00  
				
					
						
							
							
								 
						
							
								5ed24cfd71 
								
							 
						 
						
							
							
								
								Add blog post about the meet up.  
							
							
							
						 
						
							2015-01-20 19:40:43 -08:00  
				
					
						
							
							
								 
						
							
								88348ae0ee 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #3331  [ci skip]  
							
							
							
						 
						
							2015-01-20 19:54:52 -06:00  
				
					
						
							
							
								 
						
							
								c4255ebc58 
								
							 
						 
						
							
							
								
								Merge pull request  #3331  from tkrotoff/fix-site-nav-alignment  
							
							
							
						 
						
							2015-01-20 19:54:49 -06:00  
				
					
						
							
							
								 
						
							
								53a59544e8 
								
							 
						 
						
							
							
								
								Fix site-nav alignment  
							
							
							
						 
						
							2015-01-21 01:44:31 +01:00  
				
					
						
							
							
								 
						
							
								018f333973 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #3326  [ci skip]  
							
							
							
						 
						
							2015-01-19 18:12:38 -08:00  
				
					
						
							
							
								 
						
							
								c2f0b9a799 
								
							 
						 
						
							
							
								
								Merge pull request  #3326  from alfredxing/check-regen-method  
							
							
							
						 
						
							2015-01-19 18:12:18 -08:00  
				
					
						
							
							
								 
						
							
								58e231ce40 
								
							 
						 
						
							
							
								
								Rename Regenerator#write to Regenerator#write_metadata  
							
							
							
						 
						
							2015-01-19 16:29:50 -08:00  
				
					
						
							
							
								 
						
							
								29aabd84bd 
								
							 
						 
						
							
							
								
								Fix up tests  
							
							
							
						 
						
							2015-01-19 16:23:51 -08:00  
				
					
						
							
							
								 
						
							
								90eecc5da6 
								
							 
						 
						
							
							
								
								Fix nav items alignment when in "burger" mode  
							
							
							
						 
						
							2015-01-19 20:55:32 +01:00  
				
					
						
							
							
								 
						
							
								3d60299ea9 
								
							 
						 
						
							
							
								
								Test updates: Removed permalink config, updated template  
							
							
							
						 
						
							2015-01-18 23:03:27 -06:00  
				
					
						
							
							
								 
						
							
								382049d558 
								
							 
						 
						
							
							
								
								Added a unit test for nil value in permalink template keys  
							
							
							
						 
						
							2015-01-18 15:51:21 -06:00  
				
					
						
							
							
								 
						
							
								fe5f0d124c 
								
							 
						 
						
							
							
								
								Move all regenerate? checking to Regenerator  
							
							
							
						 
						
							2015-01-18 11:05:06 -08:00  
				
					
						
							
							
								 
						
							
								589919d58a 
								
							 
						 
						
							
							
								
								Strip slashes on nil url tokens  
							
							
							
						 
						
							2015-01-18 08:31:14 -06:00  
				
					
						
							
							
								 
						
							
								e58f8776b9 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #3319  [ci skip]  
							
							
							
						 
						
							2015-01-17 17:08:33 -08:00  
				
					
						
							
							
								 
						
							
								c378f741a8 
								
							 
						 
						
							
							
								
								Merge pull request  #3319  from jekyll/split-off-textile  
							
							
							
						 
						
							2015-01-17 17:08:15 -08:00  
				
					
						
							
							
								 
						
							
								6f440f55e0 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #3321  [ci skip]  
							
							
							
						 
						
							2015-01-17 16:56:24 -08:00  
				
					
						
							
							
								 
						
							
								cbe5f8e4dd 
								
							 
						 
						
							
							
								
								Merge pull request  #3321  from jekyll/performance-upgrades  
							
							
							
						 
						
							2015-01-17 16:55:51 -08:00  
				
					
						
							
							
								 
						
							
								dec27bc166 
								
							 
						 
						
							
							
								
								Fix last feature  
							
							
							
						 
						
							2015-01-17 16:52:12 -08:00  
				
					
						
							
							
								 
						
							
								2b29e09177 
								
							 
						 
						
							
							
								
								Fix some cucumber features.  
							
							
							
						 
						
							2015-01-17 16:52:12 -08:00  
				
					
						
							
							
								 
						
							
								9d547f74cc 
								
							 
						 
						
							
							
								
								Make all the tests happy.  
							
							
							
						 
						
							2015-01-17 16:52:12 -08:00  
				
					
						
							
							
								 
						
							
								c1da91cf5c 
								
							 
						 
						
							
							
								
								Start removing mentions of Textile.  
							
							
							
						 
						
							2015-01-17 16:51:28 -08:00  
				
					
						
							
							
								 
						
							
								877cba9811 
								
							 
						 
						
							
							
								
								Remove direct baked-in support for Textile.  
							
							
							
						 
						
							2015-01-17 16:51:28 -08:00  
				
					
						
							
							
								 
						
							
								2547d8adf3 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #3322  [ci skip]  
							
							
							
						 
						
							2015-01-17 16:50:30 -08:00  
				
					
						
							
							
								 
						
							
								091e86aa22 
								
							 
						 
						
							
							
								
								Merge pull request  #3322  from pborreli/patch-1  
							
							
							
						 
						
							2015-01-17 16:50:09 -08:00  
				
					
						
							
							
								 
						
							
								f11837dd7b 
								
							 
						 
						
							
							
								
								Fix cucumber failures due to merge of  #3134 .  
							
							
							
						 
						
							2015-01-17 16:48:12 -08:00  
				
					
						
							
							
								 
						
							
								d28fb07bb9 
								
							 
						 
						
							
							
								
								Fixed typo [ci skip]  
							
							
							
						 
						
							2015-01-18 00:45:28 +00:00  
				
					
						
							
							
								 
						
							
								aaf0ba15cc 
								
							 
						 
						
							
							
								
								Use frozen regular expressions for Utils#slugify  
							
							
							
						 
						
							2015-01-17 16:25:33 -08:00  
				
					
						
							
							
								 
						
							
								ef2d558874 
								
							 
						 
						
							
							
								
								Markdown#matches should avoid regexp  
							
							
							
						 
						
							2015-01-17 16:25:10 -08:00  
				
					
						
							
							
								 
						
							
								f7271a6ef9 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2918  [ci skip]  
							
							
							
						 
						
							2015-01-17 16:06:55 -08:00  
				
					
						
							
							
								 
						
							
								10659e1eef 
								
							 
						 
						
							
							
								
								Merge branch 'nitoyon-slugify-new-param'  
							
							... 
							
							
							
							* nitoyon-slugify-new-param:
  Remove superfluous Sass declarations.
  Move the slugify options out to their own section so as to fix the formatting.
  Document the mode parameter of slugify Liquid filter
  Add tests for mode parameters of slugify Liquid filter
  Add mode parameter to slugify Liquid filter
Conflicts:
	lib/jekyll/utils.rb
        ---> Hadn't added UTF-8 support in nitoyon's PR. 
							
						 
						
							2015-01-17 16:06:10 -08:00  
				
					
						
							
							
								 
						
							
								aaea08e094 
								
							 
						 
						
							
							
								
								Remove superfluous Sass declarations.  
							
							
							
						 
						
							2015-01-17 16:02:33 -08:00  
				
					
						
							
							
								 
						
							
								6081fcd75a 
								
							 
						 
						
							
							
								
								Move the slugify options out to their own section so as to fix the formatting.  
							
							
							
						 
						
							2015-01-17 16:00:35 -08:00  
				
					
						
							
							
								 
						
							
								18fb1bafa0 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #3320  [ci skip]  
							
							
							
						 
						
							2015-01-17 15:47:18 -08:00  
				
					
						
							
							
								 
						
							
								cf2f439db1 
								
							 
						 
						
							
							
								
								Merge pull request  #3320  from jekyll/mcallan83-test_global_post_permalinks_with_template_variables  
							
							
							
						 
						
							2015-01-17 15:47:03 -08:00  
				
					
						
							
							
								 
						
							
								87500addd5 
								
							 
						 
						
							
							
								
								Move the test & fix it.  
							
							
							
						 
						
							2015-01-17 15:46:35 -08:00  
				
					
						
							
							
								 
						
							
								5868ba1691 
								
							 
						 
						
							
							
								
								new test to prove permalinks in global config do not respect template variables  
							
							
							
						 
						
							2015-01-17 15:28:52 -08:00  
				
					
						
							
							
								 
						
							
								3fe80929ad 
								
							 
						 
						
							
							
								
								We have 47 posts now in the tests.  
							
							
							
						 
						
							2015-01-17 15:28:03 -08:00  
				
					
						
							
							
								 
						
							
								57b43e2229 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #3134  [ci skip]  
							
							
							
						 
						
							2015-01-17 15:25:17 -08:00  
				
					
						
							
							
								 
						
							
								b2099ac763 
								
							 
						 
						
							
							
								
								Merge branch 'davidized-collection_yaml_dots'  
							
							... 
							
							
							
							* davidized-collection_yaml_dots:
  Move YAML Front Matter regexp into a constant.
  Add support for collections documents to have YAML front matter ending in dots.
Conflicts:
	test/test_collections.rb 
							
						 
						
							2015-01-17 15:24:33 -08:00  
				
					
						
							
							
								 
						
							
								c7d92c4e6d 
								
							 
						 
						
							
							
								
								Move YAML Front Matter regexp into a constant.  
							
							
							
						 
						
							2015-01-17 15:23:33 -08:00  
				
					
						
							
							
								 
						
							
								7f44500b4b 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2774  [ci skip]  
							
							
							
						 
						
							2015-01-17 15:17:26 -08:00