Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								09b5477856 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1598  
							
							 
							
							
							
						 
						
							2013-10-02 21:07:40 +00:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								46dcac63b1 
								
							 
						 
						
							
							
								
								Merge pull request  #1598  from mojombo/maruku-0.6.0  
							
							 
							
							... 
							
							
							
							Downgrade to Maruku 0.6.0 to fix all the tests 
							
						 
						
							2013-10-02 14:05:55 -07:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								422b75ae39 
								
							 
						 
						
							
							
								
								Downgrade to Maruku 0.6.0 to fix all the tests  
							
							 
							
							
							
						 
						
							2013-10-02 15:05:33 +00:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								7a4ea086a1 
								
							 
						 
						
							
							
								
								Output path in case of render error in included file  
							
							 
							
							... 
							
							
							
							Fixes  #1591 . 
							
						 
						
							2013-10-01 23:02:50 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								623fa14b3c 
								
							 
						 
						
							
							
								
								Include tag: provide path in case of render error  
							
							 
							
							
							
						 
						
							2013-10-01 22:54:39 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								2a92ad77cc 
								
							 
						 
						
							
							
								
								Document variables in include tag  
							
							 
							
							
							
						 
						
							2013-10-01 22:31:16 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								4c6ccc8009 
								
							 
						 
						
							
							
								
								extend feature to ensure it works with parameters as well  
							
							 
							
							
							
						 
						
							2013-10-01 22:31:13 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								2138dfc0ac 
								
							 
						 
						
							
							
								
								Fix code to allow dots in variables  
							
							 
							
							
							
						 
						
							2013-10-01 22:31:11 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								a93795bcc0 
								
							 
						 
						
							
							
								
								implement variable retrieval in include tag  
							
							 
							
							... 
							
							
							
							Fixes  #1464 . 
							
						 
						
							2013-10-01 22:28:45 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								50e945f251 
								
							 
						 
						
							
							
								
								Add a cucumber feature for variable includes  
							
							 
							
							
							
						 
						
							2013-10-01 22:22:50 +02:00  
						
					 
				
					
						
							
							
								 
								Xavier Noria
							
						 
						
							 
							
							
							
							
								
							
							
								4e2217986f 
								
							 
						 
						
							
							
								
								another pass on the documentation of generators  
							
							 
							
							... 
							
							
							
							This commit refines the docs contributed in f074bb6 . 
							
						 
						
							2013-10-01 20:16:37 +02:00  
						
					 
				
					
						
							
							
								 
								Matt Swanson
							
						 
						
							 
							
							
							
							
								
							
							
								3b6b56c220 
								
							 
						 
						
							
							
								
								Rebase on upstream/master; rename file to work with docs_ul includes file  
							
							 
							
							
							
						 
						
							2013-10-01 10:34:29 -04:00  
						
					 
				
					
						
							
							
								 
								Matt Swanson
							
						 
						
							 
							
							
							
							
								
							
							
								eca642bf6f 
								
							 
						 
						
							
							
								
								Fix typo in data docs; update section pagination for migrations to correctly point back to data  
							
							 
							
							
							
						 
						
							2013-10-01 10:26:51 -04:00  
						
					 
				
					
						
							
							
								 
								Matt Swanson
							
						 
						
							 
							
							
							
							
								
							
							
								f864b69019 
								
							 
						 
						
							
							
								
								Add docs for new Data Files feature  
							
							 
							
							
							
						 
						
							2013-10-01 10:26:51 -04:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								cb8572fedb 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1514  
							
							 
							
							
							
						 
						
							2013-09-30 22:55:26 -05:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								9d4f9169e9 
								
							 
						 
						
							
							
								
								Merge pull request  #1514  from maul-esel/tag-errors  
							
							 
							
							... 
							
							
							
							Consistent error handling in Liquid tags 
							
						 
						
							2013-09-30 20:54:42 -07:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								246825ac12 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1003  
							
							 
							
							
							
						 
						
							2013-09-30 22:50:23 -05:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								cb4d15561c 
								
							 
						 
						
							
							
								
								Merge pull request  #1003  from liufengyun/data-sources  
							
							 
							
							... 
							
							
							
							support data sources 
							
						 
						
							2013-09-30 20:47:57 -07:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								e8cab9da26 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1586  
							
							 
							
							
							
						 
						
							2013-09-30 22:47:18 -05:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								3071fcde11 
								
							 
						 
						
							
							
								
								Merge pull request  #1586  from mojombo/print-webrick-url-if-muted  
							
							 
							
							... 
							
							
							
							Print server address when launching a server. 
							
						 
						
							2013-09-30 20:46:39 -07:00  
						
					 
				
					
						
							
							
								 
								liufengyun
							
						 
						
							 
							
							
							
							
								
							
							
								760cbc7f91 
								
							 
						 
						
							
							
								
								Autoload yaml files under _data directory  
							
							 
							
							... 
							
							
							
							The jekyll engine will autoload all yaml files(ends with .yml or .yaml)
under _data. If there's a file members.yml under the directory, then user
can access contents of the file through site.members. 
							
						 
						
							2013-10-01 11:23:33 +08:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								92907c9545 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1590  
							
							 
							
							
							
						 
						
							2013-09-30 16:41:10 -05:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								670ec70c84 
								
							 
						 
						
							
							
								
								Merge pull request  #1590  from fxn/master  
							
							 
							
							... 
							
							
							
							adds more information to the documentation of generators 
							
						 
						
							2013-09-30 14:40:35 -07:00  
						
					 
				
					
						
							
							
								 
								Xavier Noria
							
						 
						
							 
							
							
							
							
								
							
							
								f074bb6ae6 
								
							 
						 
						
							
							
								
								adds more information to the documentation of generators  
							
							 
							
							
							
						 
						
							2013-09-30 23:04:29 +02:00  
						
					 
				
					
						
							
							
								 
								Dmitry Chestnykh
							
						 
						
							 
							
							
							
							
								
							
							
								58cab6b050 
								
							 
						 
						
							
							
								
								Handle destinations outside of source.  
							
							 
							
							
							
						 
						
							2013-09-30 05:55:38 +02:00  
						
					 
				
					
						
							
							
								 
								Dmitry Chestnykh
							
						 
						
							 
							
							
							
							
								
							
							
								dfaf1f45cc 
								
							 
						 
						
							
							
								
								Remove require 'pathname': already included.  
							
							 
							
							
							
						 
						
							2013-09-30 05:11:15 +02:00  
						
					 
				
					
						
							
							
								 
								Dmitry Chestnykh
							
						 
						
							 
							
							
							
							
								
							
							
								8fe25a6958 
								
							 
						 
						
							
							
								
								Replace directory_watcher with listen.  
							
							 
							
							... 
							
							
							
							Directory_watcher consumed ~25% CPU on big Jekyll projects (depending on
the number of watched files), since it polled for changes every second.
Listen is easier on CPU, as it uses directory change notifications
provided by OS (currently OS X and Linux), falling back to polling when
they are not available. 
							
						 
						
							2013-09-30 04:33:04 +02:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								924285695c 
								
							 
						 
						
							
							
								
								Print server address when launching a server.  
							
							 
							
							... 
							
							
							
							Related to: https://github.com/mojombo/jekyll/issues/1583  
							
						 
						
							2013-09-28 19:18:36 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								425885460f 
								
							 
						 
						
							
							
								
								DARN YOU RUBY 1.8.7 AND YOUR DIFFERENT TIME.TO_S METHOD  
							
							 
							
							
							
						 
						
							2013-09-28 14:16:57 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								d958fd5679 
								
							 
						 
						
							
							
								
								Clean it up, clean it up.  
							
							 
							
							
							
						 
						
							2013-09-28 13:26:55 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								2dd7964926 
								
							 
						 
						
							
							
								
								C'mon, you're a Ruby developer. What are you doing.  
							
							 
							
							
							
						 
						
							2013-09-27 21:56:24 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								aa6ee14fb7 
								
							 
						 
						
							
							
								
								Get some nice Regexp which is agnostic about the seconds.  
							
							 
							
							
							
						 
						
							2013-09-27 15:38:38 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								35336bfff4 
								
							 
						 
						
							
							
								
								Update history to reflect the merge of  #1577 .  
							
							 
							
							
							
						 
						
							2013-09-27 15:12:50 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								26803c28db 
								
							 
						 
						
							
							
								
								Remove gist URL in pagination docs.  
							
							 
							
							
							
						 
						
							2013-09-27 15:11:59 -04:00  
						
					 
				
					
						
							
							
								 
								张君君
							
						 
						
							 
							
							
							
							
								
							
							
								dd6d0b42fe 
								
							 
						 
						
							
							
								
								Update pagination example  
							
							 
							
							
							
						 
						
							2013-09-26 00:11:06 +08:00  
						
					 
				
					
						
							
							
								 
								wǒ_is神仙
							
						 
						
							 
							
							
							
							
								
							
							
								d800cdcc31 
								
							 
						 
						
							
							
								
								Merge pull request  #1  from mojombo/master  
							
							 
							
							... 
							
							
							
							sync 
							
						 
						
							2013-09-25 09:03:22 -07:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								5badf7d53b 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1449  
							
							 
							
							
							
						 
						
							2013-09-23 22:31:38 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								27347596ad 
								
							 
						 
						
							
							
								
								Merge pull request  #1449  from shigeya/config-encoding-and-yaml-opts  
							
							 
							
							... 
							
							
							
							Adding "encoding" configuration (4th version) 
							
						 
						
							2013-09-23 19:30:44 -07:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								903be7b750 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1571  
							
							 
							
							
							
						 
						
							2013-09-23 10:17:43 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								c78c4159c0 
								
							 
						 
						
							
							
								
								Merge pull request  #1571  from mojombo/non-destructive-array-concat  
							
							 
							
							... 
							
							
							
							Use + instead of Array#concat 
							
						 
						
							2013-09-23 07:16:41 -07:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								93b5004c48 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1574  
							
							 
							
							
							
						 
						
							2013-09-23 09:12:44 -05:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								d3cddc7c8b 
								
							 
						 
						
							
							
								
								Merge pull request  #1574  from Aptary/simplified_css  
							
							 
							
							... 
							
							
							
							Remove overly specific css from main.css in site_template 
							
						 
						
							2013-09-23 07:11:46 -07:00  
						
					 
				
					
						
							
							
								 
								Edward Ball
							
						 
						
							 
							
							
							
							
								
							
							
								943acc4395 
								
							 
						 
						
							
							
								
								Remove overly specific css from site template  
							
							 
							
							
							
						 
						
							2013-09-23 13:23:54 +01:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								a88a63da2d 
								
							 
						 
						
							
							
								
								Don't use destructive Array#concat for Liquid Attribute arrays  
							
							 
							
							
							
						 
						
							2013-09-22 18:26:34 -04:00  
						
					 
				
					
						
							
							
								 
								Tom Preston-Werner
							
						 
						
							 
							
							
							
							
								
							
							
								b0694e96d1 
								
							 
						 
						
							
							
								
								Removing Sparkleshare files. Thanks Sparkleshare, for that.  
							
							 
							
							
							
						 
						
							2013-09-20 20:02:40 -07:00  
						
					 
				
					
						
							
							
								 
								Tom Preston-Werner
							
						 
						
							 
							
							
							
							
								
							
							
								1bfc10dd32 
								
							 
						 
						
							
							
								
								+ ‘.sparkleshare’  
							
							 
							
							... 
							
							
							
							+ ‘SparkleShare.txt’ 
							
						 
						
							2013-09-20 19:59:03 -07:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								1829c2734a 
								
							 
						 
						
							
							
								
								'gist' tag: switch to ArgumentError exception class  
							
							 
							
							... 
							
							
							
							SyntaxError is reserved for Ruby's internal use.
Adjust the tests, including the call to liquid to
make it rethrow ArgumentErrors. 
							
						 
						
							2013-09-19 23:23:04 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								9409a3d034 
								
							 
						 
						
							
							
								
								raise exceptions in include tag  
							
							 
							
							
							
						 
						
							2013-09-19 14:32:15 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								72c3bba56a 
								
							 
						 
						
							
							
								
								Change error handling in 'post_url' tag: raise exception  
							
							 
							
							
							
						 
						
							2013-09-19 14:24:22 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								39c0d125bb 
								
							 
						 
						
							
							
								
								fix tests for new behaviour  
							
							 
							
							
							
						 
						
							2013-09-19 14:24:22 +02:00