6c4a1bf00e 
								
							 
						 
						
							
							
								
								Docs: Quickstart - added documentation about the `--force` option if directory is not empty  
							
							
							
						 
						
							2016-01-27 22:22:12 -05:00  
				
					
						
							
							
								 
						
							
								5fc48ffcb9 
								
							 
						 
						
							
							
								
								Suppress stdout in liquid profiling test  
							
							... 
							
							
							
							The test was spewing out some whitespace 
							
						 
						
							2016-01-27 14:06:48 -08:00  
				
					
						
							
							
								 
						
							
								e898b6e8bd 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4403  [ci skip]  
							
							
							
						 
						
							2016-01-27 11:01:26 -08:00  
				
					
						
							
							
								 
						
							
								6cd393c8ef 
								
							 
						 
						
							
							
								
								Merge pull request  #4403  from jekyll/page.dir-must-have-slash  
							
							... 
							
							
							
							Merge pull request 4403 
							
						 
						
							2016-01-27 11:01:25 -08:00  
				
					
						
							
							
								 
						
							
								b1868983c7 
								
							 
						 
						
							
							
								
								Add test for Page#dir in :date/nil modes  
							
							
							
						 
						
							2016-01-27 08:44:59 -08:00  
				
					
						
							
							
								 
						
							
								9daebe8dd2 
								
							 
						 
						
							
							
								
								Use improved Page#dir  
							
							
							
						 
						
							2016-01-27 08:32:36 -08:00  
				
					
						
							
							
								 
						
							
								b70ee10198 
								
							 
						 
						
							
							
								
								Add benchmarks for Page#dir  
							
							
							
						 
						
							2016-01-27 08:28:41 -08:00  
				
					
						
							
							
								 
						
							
								aad54c9a87 
								
							 
						 
						
							
							
								
								Add Utils.merged_file_read_opts to unify reading & strip the BOM  
							
							
							
						 
						
							2016-01-26 17:08:54 -08:00  
				
					
						
							
							
								 
						
							
								38b64faeb2 
								
							 
						 
						
							
							
								
								Page#dir: ensure it ends in a slash  
							
							
							
						 
						
							2016-01-26 16:44:30 -08:00  
				
					
						
							
							
								 
						
							
								ce77fe6488 
								
							 
						 
						
							
							
								
								Update history.markdown to reflect the merger of  #4402  
							
							
							
						 
						
							2016-01-26 06:55:55 -06:00  
				
					
						
							
							
								 
						
							
								a13102f039 
								
							 
						 
						
							
							
								
								Merge pull request  #4402  from davidcelis/update-code-of-conduct  
							
							... 
							
							
							
							Update the Code of Conduct to the latest version 
							
						 
						
							2016-01-26 06:54:59 -06:00  
				
					
						
							
							
								 
						
							
								ea5e3d56f5 
								
							 
						 
						
							
							
								
								Update the Code of Conduct to the latest version  
							
							... 
							
							
							
							The Contributor Code of Conduct is now at version 1.3.0 and has several
changes. Many of these are simply wording changes, but an important note
is added that project maintainers must maintain confidentiality when
dealing with any code of conduct violations. Additionally, a note is
added that states violations will be investigated and dealt with in a
way that is deemed necessary and appropriate based on the circumstances.
Signed-off-by: David Celis <me@davidcel.is> 
							
						 
						
							2016-01-25 18:40:16 -08:00  
				
					
						
							
							
								 
						
							
								74fb4aca16 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4401  [ci skip]  
							
							
							
						 
						
							2016-01-25 15:49:23 -08:00  
				
					
						
							
							
								 
						
							
								a4ba8246d7 
								
							 
						 
						
							
							
								
								Merge pull request  #4401  from jekyll/fix-documents-with-permalink-with-slash  
							
							... 
							
							
							
							Merge pull request 4401 
							
						 
						
							2016-01-25 15:49:22 -08:00  
				
					
						
							
							
								 
						
							
								d7ff4234f0 
								
							 
						 
						
							
							
								
								Renderer#output_ext: honor folders when looking for ext  
							
							... 
							
							
							
							Previously, even if the document permalink was a folder, it would look for
an extension on that.  For example, if I have:
    permalink: "/new-version-jekyll-v3.0.0/"
the output_ext would be ".0".  Now, the output_ext honors the trailing
slash and will report based on the converters instead. 
							
						 
						
							2016-01-25 15:32:44 -08:00  
				
					
						
							
							
								 
						
							
								e940dd1be4 
								
							 
						 
						
							
							
								
								Site: make github-pages project page url structure refer to site.github.url  
							
							
							
						 
						
							2016-01-25 14:09:22 -08:00  
				
					
						
							
							
								 
						
							
								29da9024ca 
								
							 
						 
						
							
							
								
								Today, not yesterday.  
							
							
							
						 
						
							2016-01-24 13:17:38 -08:00  
				
					
						
							
							
								 
						
							
								778fa4cc0e 
								
							 
						 
						
							
							
								
								Release  💎  3.1.0  
							
							
							
						 
						
							2016-01-24 13:13:53 -08:00  
				
					
						
							
							
								 
						
							
								55910f19c3 
								
							 
						 
						
							
							
								
								Merge branch 'master' of github.com:jekyll/jekyll  
							
							... 
							
							
							
							* 'master' of github.com:jekyll/jekyll:
  Make our .travis.yml a little easier to maintain.
  Update History.markdown to reflect the merger of #4394 
  Minor spelling error 
							
						 
						
							2016-01-24 13:13:21 -08:00  
				
					
						
							
							
								 
						
							
								368f5b67a9 
								
							 
						 
						
							
							
								
								Release  💎  3.1.0  
							
							
							
						 
						
							2016-01-24 13:13:15 -08:00  
				
					
						
							
							
								 
						
							
								c5818d1837 
								
							 
						 
						
							
							
								
								Make our .travis.yml a little easier to maintain.  
							
							
							
						 
						
							2016-01-24 09:50:02 -06:00  
				
					
						
							
							
								 
						
							
								ab8f2d6bb1 
								
							 
						 
						
							
							
								
								Update History.markdown to reflect the merger of  #4394  
							
							
							
						 
						
							2016-01-24 08:40:31 -06:00  
				
					
						
							
							
								 
						
							
								7b5febdcd5 
								
							 
						 
						
							
							
								
								Merge pull request  #4394  from j26design/patch-1  
							
							... 
							
							
							
							Minor spelling error 
							
						 
						
							2016-01-24 08:39:35 -06:00  
				
					
						
							
							
								 
						
							
								96b80b1a72 
								
							 
						 
						
							
							
								
								Minor spelling error  
							
							
							
						 
						
							2016-01-23 23:27:17 -07:00  
				
					
						
							
							
								 
						
							
								4b827e1797 
								
							 
						 
						
							
							
								
								Release  💎  3.1.0.pre.rc3  
							
							
							
						 
						
							2016-01-22 13:15:41 -08:00  
				
					
						
							
							
								 
						
							
								4d138c9ab5 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4195  [ci skip]  
							
							
							
						 
						
							2016-01-22 13:13:19 -08:00  
				
					
						
							
							
								 
						
							
								ccb382679a 
								
							 
						 
						
							
							
								
								Merge pull request  #4195  from jekyll/pull/cleanup-document__post_read  
							
							... 
							
							
							
							Merge pull request 4195 
							
						 
						
							2016-01-22 13:13:18 -08:00  
				
					
						
							
							
								 
						
							
								6d67e9bdd4 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4388  [ci skip]  
							
							
							
						 
						
							2016-01-22 13:01:05 -08:00  
				
					
						
							
							
								 
						
							
								512c7fdb05 
								
							 
						 
						
							
							
								
								Merge pull request  #4388  from jekyll/fix-page.class-access  
							
							... 
							
							
							
							Merge pull request 4388 
							
						 
						
							2016-01-22 13:01:04 -08:00  
				
					
						
							
							
								 
						
							
								2b8de59717 
								
							 
						 
						
							
							
								
								remove merge conflict  
							
							
							
						 
						
							2016-01-22 09:38:34 -08:00  
				
					
						
							
							
								 
						
							
								afff4f0bec 
								
							 
						 
						
							
							
								
								Merge remote-tracking branch 'origin/pull/cleanup-document__post_read' into pull/cleanup-document__post_read  
							
							... 
							
							
							
							* origin/pull/cleanup-document__post_read:
  add Utils.strip_heredoc
  Fix  #4191 : Reduce Document#post_read complexity slightly.
  Fix  #4188 : Extract title from filename successfully when dateless. 
							
						 
						
							2016-01-22 09:37:58 -08:00  
				
					
						
							
							
								 
						
							
								5878acaaf1 
								
							 
						 
						
							
							
								
								Document#post_read: only overwrite slug & ext if they aren't set by YAML  
							
							
							
						 
						
							2016-01-22 09:36:55 -08:00  
				
					
						
							
							
								 
						
							
								6c40c7f553 
								
							 
						 
						
							
							
								
								collections.feature: check for 0 exit status always  
							
							
							
						 
						
							2016-01-22 09:36:37 -08:00  
				
					
						
							
							
								 
						
							
								ba1cfab73c 
								
							 
						 
						
							
							
								
								step_definitions: fixture collections should copy _thanksgiving  
							
							
							
						 
						
							2016-01-22 09:36:25 -08:00  
				
					
						
							
							
								 
						
							
								8204e479c3 
								
							 
						 
						
							
							
								
								add Utils.strip_heredoc  
							
							
							
						 
						
							2016-01-22 09:11:56 -08:00  
				
					
						
							
							
								 
						
							
								67f842546e 
								
							 
						 
						
							
							
								
								Fix   #4191 : Reduce Document#post_read complexity slightly.  
							
							
							
						 
						
							2016-01-22 09:11:56 -08:00  
				
					
						
							
							
								 
						
							
								1298ba6908 
								
							 
						 
						
							
							
								
								Fix   #4188 : Extract title from filename successfully when dateless.  
							
							
							
						 
						
							2016-01-22 09:09:30 -08:00  
				
					
						
							
							
								 
						
							
								c0e0159783 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4389  [ci skip]  
							
							
							
						 
						
							2016-01-22 09:03:44 -08:00  
				
					
						
							
							
								 
						
							
								c42d27e428 
								
							 
						 
						
							
							
								
								Merge pull request  #4389  from zsyed91/refactor_page_permalink  
							
							... 
							
							
							
							Merge pull request 4389 
							
						 
						
							2016-01-22 09:03:43 -08:00  
				
					
						
							
							
								 
						
							
								95df351341 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #4390  [ci skip]  
							
							
							
						 
						
							2016-01-22 09:01:21 -08:00  
				
					
						
							
							
								 
						
							
								cbe66193c2 
								
							 
						 
						
							
							
								
								Merge pull request  #4390  from contentful/contentful/add-contentful-to-docs  
							
							... 
							
							
							
							Merge pull request 4390 
							
						 
						
							2016-01-22 09:01:20 -08:00  
				
					
						
							
							
								 
						
							
								cf51e32d0e 
								
							 
						 
						
							
							
								
								Drop#[]: use self.class.invokable? instead of content_methods.include? for speed  
							
							
							
						 
						
							2016-01-22 08:59:48 -08:00  
				
					
						
							
							
								 
						
							
								442074fdb1 
								
							 
						 
						
							
							
								
								Add Contentful Extension to Plugins  
							
							
							
						 
						
							2016-01-22 13:29:31 -03:00  
				
					
						
							
							
								 
						
							
								4ecdf6ce10 
								
							 
						 
						
							
							
								
								Remove extra OR condition since a missing hash key will return a nil anyway. Added a test to catch this nil condition since it was missing to begin with. Reduced line length in test_page.rb  
							
							
							
						 
						
							2016-01-21 23:44:30 -06:00  
				
					
						
							
							
								 
						
							
								31ae61b419 
								
							 
						 
						
							
							
								
								Drop#[]: only use public_send for keys in the content_methods array  
							
							
							
						 
						
							2016-01-21 18:20:35 -08:00  
				
					
						
							
							
								 
						
							
								b3ddd985a4 
								
							 
						 
						
							
							
								
								Merge pull request  #4380  from jekyll/cherry-pick-4378  
							
							... 
							
							
							
							Document: throw a useful error when an invalid date is given 
							
						 
						
							2016-01-20 14:58:44 -08:00  
				
					
						
							
							
								 
						
							
								4017e30cca 
								
							 
						 
						
							
							
								
								Merge pull request  #4382  from jekyll/3.0.2-release  
							
							... 
							
							
							
							Release 💎  v3.0.2 
							
						 
						
							2016-01-20 14:34:00 -08:00  
				
					
						
							
							
								 
						
							
								e9be8933de 
								
							 
						 
						
							
							
								
								Release  💎  v3.0.2  
							
							
							
						 
						
							2016-01-20 14:33:02 -08:00  
				
					
						
							
							
								 
						
							
								a72629908a 
								
							 
						 
						
							
							
								
								Document: throw a useful error when an invalid date is given  
							
							
							
						 
						
							2016-01-20 14:19:06 -08:00  
				
					
						
							
							
								 
						
							
								1ba23c32c6 
								
							 
						 
						
							
							
								
								add Utils.strip_heredoc  
							
							
							
						 
						
							2016-01-20 11:46:18 -08:00