Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								02676572dd 
								
							 
						 
						
							
							
								
								Allow dots in collection labels.  
							
							 
							
							
							
						 
						
							2014-06-28 16:51:19 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								404661fc72 
								
							 
						 
						
							
							
								
								You need NodeJS in order to install jekyll-coffeescript.  
							
							 
							
							
							
						 
						
							2014-06-28 16:09:19 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								5c3f013325 
								
							 
						 
						
							
							
								
								Upgrade to jekyll-watch 1.0.  
							
							 
							
							
							
						 
						
							2014-06-27 17:52:54 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								ea4aa4f149 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2550  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-27 17:51:16 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								0c8fc63b33 
								
							 
						 
						
							
							
								
								Merge pull request  #2550  from jekyll/extract-watch  
							
							 
							
							
							
						 
						
							2014-06-27 17:50:51 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								c239746363 
								
							 
						 
						
							
							
								
								Use bundle exec in CI guide. [ci skip]  
							
							 
							
							... 
							
							
							
							h/t @ndarville
Ref: #2432  
							
						 
						
							2014-06-27 17:10:06 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								12b47cc037 
								
							 
						 
						
							
							
								
								Spike out jekyll <cmd> --watch into a separate gem.  
							
							 
							
							
							
						 
						
							2014-06-27 16:41:10 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								2c636086bd 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2432  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-27 16:40:02 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								6a7386e6ba 
								
							 
						 
						
							
							
								
								Merge pull request  #2432  from jekyll/docs-4-ci  
							
							 
							
							
							
						 
						
							2014-06-27 16:39:19 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								21ab9f8b9e 
								
							 
						 
						
							
							
								
								Speak English good. h/t @gjtorikian  
							
							 
							
							
							
						 
						
							2014-06-27 16:35:21 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								eab113e4f5 
								
							 
						 
						
							
							
								
								html-proof ~> htmlproof  
							
							 
							
							
							
						 
						
							2014-06-27 15:43:37 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								bd4a8c1ce2 
								
							 
						 
						
							
							
								
								Fixes, fixes.  
							
							 
							
							
							
						 
						
							2014-06-27 15:32:16 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								e2de7ab0c7 
								
							 
						 
						
							
							
								
								Finish CI guide.  
							
							 
							
							
							
						 
						
							2014-06-27 15:25:33 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								a6e80b2bc1 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2547  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-27 03:56:39 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								3f5a55e240 
								
							 
						 
						
							
							
								
								Merge pull request  #2547  from penibelst/docs-url  
							
							 
							
							
							
						 
						
							2014-06-27 03:56:23 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								b79be6d320 
								
							 
						 
						
							
							
								
								updates to CI page. [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-27 03:53:41 -04:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								60bb78e25b 
								
							 
						 
						
							
							
								
								Remove wrong statement  
							
							 
							
							
							
						 
						
							2014-06-27 09:44:39 +02:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								281fb549f8 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2542  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-25 16:56:49 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								d16f62cb38 
								
							 
						 
						
							
							
								
								Ensure exclude and include arrays are arrays of strings.  
							
							 
							
							... 
							
							
							
							Fixes  #2542 . 
							
						 
						
							2014-06-25 16:56:27 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								912bd84629 
								
							 
						 
						
							
							
								
								A little more work.  
							
							 
							
							
							
						 
						
							2014-06-25 16:17:42 -04:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								d77078518d 
								
							 
						 
						
							
							
								
								Add new page  
							
							 
							
							
							
						 
						
							2014-06-25 16:17:42 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								e310af00b4 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2532  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-25 16:14:56 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								cedbdf43ca 
								
							 
						 
						
							
							
								
								Merge pull request  #2532  from alexmedearis/hl_lines  
							
							 
							
							
							
						 
						
							2014-06-25 16:14:14 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								911559fe05 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2544  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-25 16:13:58 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								c958eae551 
								
							 
						 
						
							
							
								
								Merge pull request  #2544  from mikecole/patch-2  
							
							 
							
							
							
						 
						
							2014-06-25 16:13:31 -04:00  
						
					 
				
					
						
							
							
								 
								mikecole
							
						 
						
							 
							
							
							
							
								
							
							
								053ba9a9ca 
								
							 
						 
						
							
							
								
								Provide an updated, more comprehensive link...  
							
							 
							
							... 
							
							
							
							to Windows installation instructions. 
							
						 
						
							2014-06-25 13:50:07 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								c5aa74f823 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2490  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-24 23:04:53 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								20180923cf 
								
							 
						 
						
							
							
								
								Merge pull request  #2490  from penibelst/deep-defaults  
							
							 
							
							
							
						 
						
							2014-06-24 23:04:38 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								6e104c3ed0 
								
							 
						 
						
							
							
								
								Ensure the post categories are unique (only one). Ref:  #2527   #2531  
							
							 
							
							... 
							
							
							
							h/t @Nicholas-Perry
https://github.com/jekyll/jekyll/issues/2527#issuecomment-47041756  
							
						 
						
							2014-06-24 19:15:02 -04:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								880a503094 
								
							 
						 
						
							
							
								
								Add a test  
							
							 
							
							
							
						 
						
							2014-06-24 20:27:01 +02:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								edbc273829 
								
							 
						 
						
							
							
								
								Use Utils.deep_merge_hashes  
							
							 
							
							
							
						 
						
							2014-06-24 20:24:26 +02:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								5f807e7421 
								
							 
						 
						
							
							
								
								Merge deep  
							
							 
							
							
							
						 
						
							2014-06-24 20:20:15 +02:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								579d9fc813 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2477  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-23 19:11:17 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								dc074fcc50 
								
							 
						 
						
							
							
								
								Merge pull request  #2477  from jekyll/serve-skip-initial-build  
							
							 
							
							
							
						 
						
							2014-06-23 19:06:10 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								5d95267c4a 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2495  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-23 19:04:40 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								69fdd45459 
								
							 
						 
						
							
							
								
								Merge pull request  #2495  from jekyll/latest-liquid  
							
							 
							
							
							
						 
						
							2014-06-23 19:04:19 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								d3370bf596 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2493  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-23 19:03:50 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								d359c63018 
								
							 
						 
						
							
							
								
								Merge pull request  #2493  from jekyll/fix-sort  
							
							 
							
							
							
						 
						
							2014-06-23 19:02:54 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								a9376f0a41 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2511  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-23 19:01:55 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								e75dcc18f1 
								
							 
						 
						
							
							
								
								Merge pull request  #2511  from denilsonsa/patch-1  
							
							 
							
							
							
						 
						
							2014-06-23 19:01:31 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								7da0cfd0d8 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2524  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-23 19:00:38 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								b0e51e2cba 
								
							 
						 
						
							
							
								
								Merge pull request  #2524  from jekyll/all-html-files  
							
							 
							
							
							
						 
						
							2014-06-23 18:59:57 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								a762956000 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2531  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-23 18:59:10 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								e58c1ee306 
								
							 
						 
						
							
							
								
								Merge pull request  #2531  from jekyll/merge-post-categories  
							
							 
							
							
							
						 
						
							2014-06-23 18:58:51 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								fd3ceb60c8 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2535  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-23 18:56:04 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								4c04420a51 
								
							 
						 
						
							
							
								
								Merge pull request  #2535  from simonsarris/master  
							
							 
							
							
							
						 
						
							2014-06-23 18:54:11 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								e345ceb01a 
								
							 
						 
						
							
							
								
								Update history to reflect merge of  #2536  [ci skip]  
							
							 
							
							
							
						 
						
							2014-06-21 12:56:09 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								f3e4157698 
								
							 
						 
						
							
							
								
								Merge pull request  #2536  from letuboy/master  
							
							 
							
							
							
						 
						
							2014-06-21 12:55:37 -04:00  
						
					 
				
					
						
							
							
								 
								Paul Henry
							
						 
						
							 
							
							
							
							
								
							
							
								1a99b241ca 
								
							 
						 
						
							
							
								
								nil parsed in yaml is just a string, should be explicit  
							
							 
							
							
							
						 
						
							2014-06-20 17:13:21 -07:00  
						
					 
				
					
						
							
							
								 
								Simon Sarris
							
						 
						
							 
							
							
							
							
								
							
							
								74f0f27d18 
								
							 
						 
						
							
							
								
								Before copying file, explicitly remove the old one  
							
							 
							
							... 
							
							
							
							On Windows, FileUtils.cp(path, dest_path) will fail with a Permission
Denied if the dest_path already exists and is read-only. People have
complained about this since at least 2008.
This lets `jekyll build` work without error in Windows when one or more
read-only files exist.
This change will accommodate users of Team Foundation, which uses the
read-only flag for for source control status. (dumb, I know, but but a
real problem) 
							
						 
						
							2014-06-19 18:25:00 -04:00