Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								9d7c524530 
								
							 
						 
						
							
							
								
								fix file sorting test  
							
							 
							
							
							
						 
						
							2013-12-22 19:33:00 -05:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								fa8618879d 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'upstream/master' into sort-attributes  
							
							 
							
							
							
						 
						
							2013-12-22 19:31:56 -05:00  
						
					 
				
					
						
							
							
								 
								Philip Poots
							
						 
						
							 
							
							
							
							
								
							
							
								e17f997e75 
								
							 
						 
						
							
							
								
								Clarify how to access `site`  
							
							 
							
							... 
							
							
							
							I was unable to access the config at `context.registers.config`. Everything seems to point towards the `site` variable being accessed via `context.registers[:site]`. 
							
						 
						
							2013-12-22 23:01:13 +00:00  
						
					 
				
					
						
							
							
								 
								Robin Dupret
							
						 
						
							 
							
							
							
							
								
							
							
								bd442680ea 
								
							 
						 
						
							
							
								
								Rely on the Redcarpet plugin instead of hard-coding  
							
							 
							
							... 
							
							
							
							To avoid code duplication and have to keep tracking of the API change of
Rouge, let's rely on the Redcarpet plugin and customize the output on
our needs. 
							
						 
						
							2013-12-22 18:45:46 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Dupret
							
						 
						
							 
							
							
							
							
								
							
							
								4bf716c2ad 
								
							 
						 
						
							
							
								
								Set highlighter to pygments when upgrading  
							
							 
							
							... 
							
							
							
							In case you are upgrading from 1.4.2 to 2.0 and the pygments option is
set to true, then the highlighter option will be set to pygments
automatically. 
							
						 
						
							2013-12-22 18:45:46 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Dupret
							
						 
						
							 
							
							
							
							
								
							
							
								0831d2b0f8 
								
							 
						 
						
							
							
								
								Add support for the Rouge syntax highlighter  
							
							 
							
							... 
							
							
							
							By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.
The documentation has been updated accordingly. 
							
						 
						
							2013-12-22 18:45:40 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Dupret
							
						 
						
							 
							
							
							
							
								
							
							
								92064134d6 
								
							 
						 
						
							
							
								
								Rename the pygments option to highlighter  
							
							 
							
							... 
							
							
							
							Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.
It's now more straightforward to plug another syntax highlighter. 
							
						 
						
							2013-12-22 12:45:15 +01:00  
						
					 
				
					
						
							
							
								 
								Robin Dupret
							
						 
						
							 
							
							
							
							
								
							
							
								903cce2745 
								
							 
						 
						
							
							
								
								Fix the highlight tag feature  
							
							 
							
							... 
							
							
							
							Previously, the assertion made wasn't enough to check whether the code
block was correctly parsed through Pygments (and it was not the case).
This commit simply ensure there is a div with the "highlight" class and
fix the test to correctly invoke the Liquid tag rendering. 
							
						 
						
							2013-12-22 12:29:19 +01:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								2bfafb3b33 
								
							 
						 
						
							
							
								
								make non-data properties/methods accessible to Liquid  
							
							 
							
							... 
							
							
							
							per https://github.com/jekyll/jekyll/pull/1849/files#r8490593  
							
						 
						
							2013-12-22 03:38:32 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								354b4b9c54 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1854  
							
							 
							
							
							
						 
						
							2013-12-19 19:58:36 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								8c2da13096 
								
							 
						 
						
							
							
								
								Merge pull request  #1854  from EricDobson/docs_datafiles_typo  
							
							 
							
							
							
						 
						
							2013-12-19 16:57:53 -08:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								c2b750448e 
								
							 
						 
						
							
							
								
								allow data attribute access by Liquid on Convertible items  
							
							 
							
							
							
						 
						
							2013-12-19 17:14:51 -05:00  
						
					 
				
					
						
							
							
								 
								Eric Dobson
							
						 
						
							 
							
							
							
							
								
							
							
								c79f170687 
								
							 
						 
						
							
							
								
								Fix typo in docs.  
							
							 
							
							
							
						 
						
							2013-12-19 14:39:23 -07:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								c29ffb9dd9 
								
							 
						 
						
							
							
								
								Add in 1.4.1 and 1.4.2 changelog  
							
							 
							
							
							
						 
						
							2013-12-19 15:21:42 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								8cb1dc47d9 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1848  
							
							 
							
							
							
						 
						
							2013-12-19 15:20:51 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								94e96d325b 
								
							 
						 
						
							
							
								
								Merge pull request  #1848  from afeld/sort-pages  
							
							 
							
							
							
						 
						
							2013-12-19 12:19:49 -08:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								45ee9f814a 
								
							 
						 
						
							
							
								
								clarify page sorting test  
							
							 
							
							
							
						 
						
							2013-12-19 13:46:43 -05:00  
						
					 
				
					
						
							
							
								 
								Jens Nazarenus
							
						 
						
							 
							
							
							
							
								
							
							
								412fe8b8de 
								
							 
						 
						
							
							
								
								edited documentation for include tag  
							
							 
							
							
							
						 
						
							2013-12-19 18:29:40 +01:00  
						
					 
				
					
						
							
							
								 
								Jens Nazarenus
							
						 
						
							 
							
							
							
							
								
							
							
								10ee83d680 
								
							 
						 
						
							
							
								
								edited raise message when validating included file  
							
							 
							
							
							
						 
						
							2013-12-19 18:23:21 +01:00  
						
					 
				
					
						
							
							
								 
								Jens Nazarenus
							
						 
						
							 
							
							
							
							
								
							
							
								f9ffbe0d6a 
								
							 
						 
						
							
							
								
								removed duplicate test scenario  
							
							 
							
							
							
						 
						
							2013-12-19 18:23:07 +01:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								8c1706b66e 
								
							 
						 
						
							
							
								
								clean up custom variable sort feature  
							
							 
							
							
							
						 
						
							2013-12-19 03:36:48 -05:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								35712dcadc 
								
							 
						 
						
							
							
								
								add failing test for sorting pages by custom variables  
							
							 
							
							
							
						 
						
							2013-12-19 03:35:57 -05:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								396aa16f99 
								
							 
						 
						
							
							
								
								refactor step to support page creation  
							
							 
							
							
							
						 
						
							2013-12-19 02:27:23 -05:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								5b2480c8ba 
								
							 
						 
						
							
							
								
								refactor file+matter creation in cucumber steps  
							
							 
							
							
							
						 
						
							2013-12-19 01:58:46 -05:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								a6e1c40051 
								
							 
						 
						
							
							
								
								link to Stack Overflow answer re: Dir sorting  
							
							 
							
							
							
						 
						
							2013-12-19 01:05:00 -05:00  
						
					 
				
					
						
							
							
								 
								Aidan Feldman
							
						 
						
							 
							
							
							
							
								
							
							
								3c1d45f45f 
								
							 
						 
						
							
							
								
								Sort pages by name by default  
							
							 
							
							... 
							
							
							
							The order that files are returned differs across operating systems, so
ensure that they're being sorted after the fact. 
							
						 
						
							2013-12-19 01:02:25 -05:00  
						
					 
				
					
						
							
							
								 
								schneems
							
						 
						
							 
							
							
							
							
								
							
							
								22017d085b 
								
							 
						 
						
							
							
								
								Better error message when time is not parseable  
							
							 
							
							... 
							
							
							
							Give the full path of the file that cannot be parsed so the user can locate it easier. Follow up the error message with helpful instructions: they can resolve the error by fixing the date or excluding the file or directory from being processed. 
							
						 
						
							2013-12-18 16:14:21 -06:00  
						
					 
				
					
						
							
							
								 
								Jens Nazarenus
							
						 
						
							 
							
							
							
							
								
							
							
								43ef9a2e4f 
								
							 
						 
						
							
							
								
								variables in include tag with filters  
							
							 
							
							
							
						 
						
							2013-12-17 23:51:52 +01:00  
						
					 
				
					
						
							
							
								 
								akira yamada
							
						 
						
							 
							
							
							
							
								
							
							
								ecab2eb473 
								
							 
						 
						
							
							
								
								made error description more helpful  
							
							 
							
							
							
						 
						
							2013-12-17 10:57:12 +09:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								12a55b86ac 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1836  
							
							 
							
							
							
						 
						
							2013-12-16 20:32:28 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								eaa8c8de29 
								
							 
						 
						
							
							
								
								Merge pull request  #1836  from jekyll/update-history-with-v1.4.x  
							
							 
							
							... 
							
							
							
							Update `master` with v1.4.x changes 
							
						 
						
							2013-12-16 17:31:45 -08:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								cb31e9c2db 
								
							 
						 
						
							
							
								
								Rakefile's site:releases:new should use 'release' variable instead of 'version' function to specify version in YAML front-matter  
							
							 
							
							
							
						 
						
							2013-12-16 20:31:21 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								f6e7e5cc76 
								
							 
						 
						
							
							
								
								Add link to 'a regression' in 1.4.2 release post  
							
							 
							
							
							
						 
						
							2013-12-16 20:30:06 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								8690edcae4 
								
							 
						 
						
							
							
								
								Add 1.4.2 release post  
							
							 
							
							
							
						 
						
							2013-12-16 20:26:52 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								6b5ce3a9f0 
								
							 
						 
						
							
							
								
								Add v1.4.2 to History.markdown  
							
							 
							
							
							
						 
						
							2013-12-16 20:26:43 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								d362faea3b 
								
							 
						 
						
							
							
								
								Add two tests for Maruku fenced code blocks  
							
							 
							
							
							
						 
						
							2013-12-15 16:08:45 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								1ebce26881 
								
							 
						 
						
							
							
								
								Default Maruku fenced_code_blocks to ON.  
							
							 
							
							... 
							
							
							
							Extends https://github.com/jekyll/jekyll/pull/1799  
							
						 
						
							2013-12-15 16:08:21 -05:00  
						
					 
				
					
						
							
							
								 
								akira yamada
							
						 
						
							 
							
							
							
							
								
							
							
								9d259fe315 
								
							 
						 
						
							
							
								
								added error description for invalid post name  
							
							 
							
							
							
						 
						
							2013-12-15 17:18:11 +09:00  
						
					 
				
					
						
							
							
								 
								akira yamada
							
						 
						
							 
							
							
							
							
								
							
							
								a5545d5bad 
								
							 
						 
						
							
							
								
								post_url tag raises ArgumentError for invalid name  
							
							 
							
							... 
							
							
							
							Using post_url tag with invalid name raises TypeError.
It should raise ArgumentError and should display detail of the error to
fix the error. 
							
						 
						
							2013-12-14 22:30:22 +09:00  
						
					 
				
					
						
							
							
								 
								Lachlan Holden
							
						 
						
							 
							
							
							
							
								
							
							
								62bda6076b 
								
							 
						 
						
							
							
								
								Added a link to the list of all tz database time zones  
							
							 
							
							
							
						 
						
							2013-12-14 15:04:31 +10:30  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								b7bdcb19ca 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1818  
							
							 
							
							
							
						 
						
							2013-12-11 18:31:13 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								53721dce03 
								
							 
						 
						
							
							
								
								Merge pull request  #1818  from jekyll/windows-docs  
							
							 
							
							
							
						 
						
							2013-12-11 15:26:15 -08:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								c295060f69 
								
							 
						 
						
							
							
								
								Use Markdown, silly  
							
							 
							
							
							
						 
						
							2013-12-11 18:25:02 -05:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								3e2c229e97 
								
							 
						 
						
							
							
								
								Merge pull request  #1817  from jekyll/move-to-jekyll-jekyll  
							
							 
							
							... 
							
							
							
							mojombo/jekyll ~> jekyll/jekyll 
							
						 
						
							2013-12-11 14:50:21 -08:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								6d0a168d6d 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1817  
							
							 
							
							
							
						 
						
							2013-12-11 16:47:37 -06:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								6195192bcf 
								
							 
						 
						
							
							
								
								mojombo/jekyll ~> jekyll/jekyll  
							
							 
							
							
							
						 
						
							2013-12-11 17:44:33 -05:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								379093f940 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1815  
							
							 
							
							
							
						 
						
							2013-12-11 16:00:47 -06:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								85fcd0e757 
								
							 
						 
						
							
							
								
								Merge pull request  #1815  from mojombo/redcarpet-3  
							
							 
							
							
							
						 
						
							2013-12-11 14:00:42 -08:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								827c4b9bda 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #1812  
							
							 
							
							
							
						 
						
							2013-12-11 16:53:39 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								7b23fca86e 
								
							 
						 
						
							
							
								
								Merge pull request  #1812  from mojombo/openshift-cartridge  
							
							 
							
							
							
						 
						
							2013-12-11 13:53:16 -08:00