b723a58f5f 
								
							 
						 
						
							
							
								
								Merge pull request  #1503  from swanson/add-docs-for-data-feature  
							
							... 
							
							
							
							Add docs for new Data Files feature 
							
						 
						
							2013-10-02 20:54:34 -07:00  
				
					
						
							
							
								 
						
							
								92750c3cfd 
								
							 
						 
						
							
							
								
								Add parenthesis to the call for super  
							
							
							
						 
						
							2013-10-02 21:51:32 -05:00  
				
					
						
							
							
								 
						
							
								6d74b4df00 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1596  
							
							
							
						 
						
							2013-10-02 21:48:03 -05:00  
				
					
						
							
							
								 
						
							
								6abe01f60f 
								
							 
						 
						
							
							
								
								Merge pull request  #1596  from maul-esel/error-file  
							
							... 
							
							
							
							Output path in case of liquid error in include file 
							
						 
						
							2013-10-02 19:46:31 -07:00  
				
					
						
							
							
								 
						
							
								09b5477856 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1598  
							
							
							
						 
						
							2013-10-02 21:07:40 +00:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								422b75ae39 
								
							 
						 
						
							
							
								
								Downgrade to Maruku 0.6.0 to fix all the tests  
							
							
							
						 
						
							2013-10-02 15:05:33 +00:00  
				
					
						
							
							
								 
						
							
								7a4ea086a1 
								
							 
						 
						
							
							
								
								Output path in case of render error in included file  
							
							... 
							
							
							
							Fixes  #1591 . 
						
							2013-10-01 23:02:50 +02:00  
				
					
						
							
							
								 
						
							
								623fa14b3c 
								
							 
						 
						
							
							
								
								Include tag: provide path in case of render error  
							
							
							
						 
						
							2013-10-01 22:54:39 +02:00  
				
					
						
							
							
								 
						
							
								3b6b56c220 
								
							 
						 
						
							
							
								
								Rebase on upstream/master; rename file to work with docs_ul includes file  
							
							
							
						 
						
							2013-10-01 10:34:29 -04:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								f864b69019 
								
							 
						 
						
							
							
								
								Add docs for new Data Files feature  
							
							
							
						 
						
							2013-10-01 10:26:51 -04:00  
				
					
						
							
							
								 
						
							
								cb8572fedb 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1514  
							
							
							
						 
						
							2013-09-30 22:55:26 -05:00  
				
					
						
							
							
								 
						
							
								9d4f9169e9 
								
							 
						 
						
							
							
								
								Merge pull request  #1514  from maul-esel/tag-errors  
							
							... 
							
							
							
							Consistent error handling in Liquid tags 
							
						 
						
							2013-09-30 20:54:42 -07:00  
				
					
						
							
							
								 
						
							
								246825ac12 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1003  
							
							
							
						 
						
							2013-09-30 22:50:23 -05:00  
				
					
						
							
							
								 
						
							
								cb4d15561c 
								
							 
						 
						
							
							
								
								Merge pull request  #1003  from liufengyun/data-sources  
							
							... 
							
							
							
							support data sources 
							
						 
						
							2013-09-30 20:47:57 -07:00  
				
					
						
							
							
								 
						
							
								e8cab9da26 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1586  
							
							
							
						 
						
							2013-09-30 22:47:18 -05:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								92907c9545 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1590  
							
							
							
						 
						
							2013-09-30 16:41:10 -05:00  
				
					
						
							
							
								 
						
							
								670ec70c84 
								
							 
						 
						
							
							
								
								Merge pull request  #1590  from fxn/master  
							
							... 
							
							
							
							adds more information to the documentation of generators 
							
						 
						
							2013-09-30 14:40:35 -07:00  
				
					
						
							
							
								 
						
							
								f074bb6ae6 
								
							 
						 
						
							
							
								
								adds more information to the documentation of generators  
							
							
							
						 
						
							2013-09-30 23:04:29 +02:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								35336bfff4 
								
							 
						 
						
							
							
								
								Update history to reflect the merge of  #1577 .  
							
							
							
						 
						
							2013-09-27 15:12:50 -04:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								d800cdcc31 
								
							 
						 
						
							
							
								
								Merge pull request  #1  from mojombo/master  
							
							... 
							
							
							
							sync 
							
						 
						
							2013-09-25 09:03:22 -07:00  
				
					
						
							
							
								 
						
							
								5badf7d53b 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1449  
							
							
							
						 
						
							2013-09-23 22:31:38 -04:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								903be7b750 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1571  
							
							
							
						 
						
							2013-09-23 10:17:43 -04:00  
				
					
						
							
							
								 
						
							
								c78c4159c0 
								
							 
						 
						
							
							
								
								Merge pull request  #1571  from mojombo/non-destructive-array-concat  
							
							... 
							
							
							
							Use + instead of Array#concat 
							
						 
						
							2013-09-23 07:16:41 -07:00  
				
					
						
							
							
								 
						
							
								93b5004c48 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1574  
							
							
							
						 
						
							2013-09-23 09:12:44 -05:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								943acc4395 
								
							 
						 
						
							
							
								
								Remove overly specific css from site template  
							
							
							
						 
						
							2013-09-23 13:23:54 +01:00  
				
					
						
							
							
								 
						
							
								a88a63da2d 
								
							 
						 
						
							
							
								
								Don't use destructive Array#concat for Liquid Attribute arrays  
							
							
							
						 
						
							2013-09-22 18:26:34 -04:00  
				
					
						
							
							
								 
						
							
								b0694e96d1 
								
							 
						 
						
							
							
								
								Removing Sparkleshare files. Thanks Sparkleshare, for that.  
							
							
							
						 
						
							2013-09-20 20:02:40 -07:00  
				
					
						
							
							
								 
						
							
								1bfc10dd32 
								
							 
						 
						
							
							
								
								+ ‘.sparkleshare’  
							
							... 
							
							
							
							+ ‘SparkleShare.txt’ 
							
						 
						
							2013-09-20 19:59:03 -07:00  
				
					
						
							
							
								 
						
							
								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  
				
					
						
							
							
								 
						
							
								9409a3d034 
								
							 
						 
						
							
							
								
								raise exceptions in include tag  
							
							
							
						 
						
							2013-09-19 14:32:15 +02:00  
				
					
						
							
							
								 
						
							
								72c3bba56a 
								
							 
						 
						
							
							
								
								Change error handling in 'post_url' tag: raise exception  
							
							
							
						 
						
							2013-09-19 14:24:22 +02:00  
				
					
						
							
							
								 
						
							
								39c0d125bb 
								
							 
						 
						
							
							
								
								fix tests for new behaviour  
							
							
							
						 
						
							2013-09-19 14:24:22 +02:00  
				
					
						
							
							
								 
						
							
								06fb31544f 
								
							 
						 
						
							
							
								
								Change error handling for gist tag: raise exception  
							
							
							
						 
						
							2013-09-19 14:24:22 +02:00  
				
					
						
							
							
								 
						
							
								a93b1a26eb 
								
							 
						 
						
							
							
								
								Documentation update for the encoding configuration  
							
							
							
						 
						
							2013-09-19 12:22:50 +09:00  
				
					
						
							
							
								 
						
							
								c625ddf6cd 
								
							 
						 
						
							
							
								
								Invoke File.read with or without options depends on Ruby version  
							
							... 
							
							
							
							- Extract option fetch method as a separate method
- Added File.read_with_options method to use
- With performance fix 
							
						 
						
							2013-09-19 12:22:50 +09:00  
				
					
						
							
							
								 
						
							
								97e052df63 
								
							 
						 
						
							
							
								
								Pass encoding parameter as string, not an object  
							
							
							
						 
						
							2013-09-19 12:21:26 +09:00  
				
					
						
							
							
								 
						
							
								fbea3471dd 
								
							 
						 
						
							
							
								
								Make TestConvertible to pass with utf-8 encoding  
							
							
							
						 
						
							2013-09-19 12:21:25 +09:00  
				
					
						
							
							
								 
						
							
								8b892ed735 
								
							 
						 
						
							
							
								
								read_yaml to accept optional parameter to override defaults  
							
							
							
						 
						
							2013-09-19 12:21:25 +09:00  
				
					
						
							
							
								 
						
							
								4cb24f4b87 
								
							 
						 
						
							
							
								
								consider a case of "site" is unavailable in Convertible  
							
							
							
						 
						
							2013-09-19 12:21:25 +09:00  
				
					
						
							
							
								 
						
							
								f4c2383d3c 
								
							 
						 
						
							
							
								
								write document for config.encoding  
							
							
							
						 
						
							2013-09-19 12:21:25 +09:00  
				
					
						
							
							
								 
						
							
								8a28d80690 
								
							 
						 
						
							
							
								
								add encoding for configuration  
							
							
							
						 
						
							2013-09-19 12:21:25 +09:00