Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								880a503094 
								
							 
						 
						
							
							
								
								Add a test  
							
							 
							
							
							
						 
						
							2014-06-24 20:27:01 +02:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								35ed101651 
								
							 
						 
						
							
							
								
								Add test for the concatenation of categories  
							
							 
							
							
							
						 
						
							2014-06-18 18:19:28 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								d59b2c3ef6 
								
							 
						 
						
							
							
								
								Merge pull request  #2419  from jens-na/collection-defaults  
							
							 
							
							
							
						 
						
							2014-06-12 20:38:21 -04:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								df334e809e 
								
							 
						 
						
							
							
								
								Remove coverage reporting with Coveralls  
							
							 
							
							
							
						 
						
							2014-06-09 02:35:55 +02:00  
						
					 
				
					
						
							
							
								 
								Jens Nazarenus
							
						 
						
							 
							
							
							
							
								
							
							
								467945bedb 
								
							 
						 
						
							
							
								
								Fixes the extra indentation in cucumber test  
							
							 
							
							
							
						 
						
							2014-06-01 22:21:31 +02:00  
						
					 
				
					
						
							
							
								 
								Jens Nazarenus
							
						 
						
							 
							
							
							
							
								
							
							
								e868a8437f 
								
							 
						 
						
							
							
								
								Includes tests for frontmatter defaults in documents  
							
							 
							
							
							
						 
						
							2014-06-01 22:21:31 +02:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								62129d9a2f 
								
							 
						 
						
							
							
								
								Output Jekyll output if ENV['DEBUG'] exists  
							
							 
							
							
							
						 
						
							2014-05-26 20:09:13 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								3c6377d665 
								
							 
						 
						
							
							
								
								Merge pull request  #2395  from rdumont/data-subdirectories  
							
							 
							
							
							
						 
						
							2014-05-21 01:09:15 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								65275e5841 
								
							 
						 
						
							
							
								
								Merge pull request  #2431  from jekyll/remove-collections-from-layouts  
							
							 
							
							
							
						 
						
							2014-05-21 01:07:01 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								e37b3ca8e1 
								
							 
						 
						
							
							
								
								Any assets read in as Pages shall not be rendered or layout'd  
							
							 
							
							
							
						 
						
							2014-05-21 00:52:21 -04:00  
						
					 
				
					
						
							
							
								 
								Mathieu Bruyen
							
						 
						
							 
							
							
							
							
								
							
							
								921dbe0547 
								
							 
						 
						
							
							
								
								Override collection url template  
							
							 
							
							
							
						 
						
							2014-05-17 10:40:52 +02:00  
						
					 
				
					
						
							
							
								 
								Rodrigo Dumont
							
						 
						
							 
							
							
							
							
								
							
							
								12a8be0b98 
								
							 
						 
						
							
							
								
								Add scenario for ensuring data folder over file precedence  
							
							 
							
							
							
						 
						
							2014-05-12 13:47:41 -03:00  
						
					 
				
					
						
							
							
								 
								Rodrigo Dumont
							
						 
						
							 
							
							
							
							
								
							
							
								604fb3286c 
								
							 
						 
						
							
							
								
								Allow subdirectories in _data  
							
							 
							
							
							
						 
						
							2014-05-11 20:28:49 -03:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								01c09fd7fa 
								
							 
						 
						
							
							
								
								Merge pull request  #2345  from penibelst/sort-collection  
							
							 
							
							
							
						 
						
							2014-05-10 15:42:53 -04:00  
						
					 
				
					
						
							
							
								 
								Ben Balter
							
						 
						
							 
							
							
							
							
								
							
							
								5129a3ccc3 
								
							 
						 
						
							
							
								
								add tests for json data  
							
							 
							
							
							
						 
						
							2014-05-09 10:29:37 -04:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								5dcd84b71b 
								
							 
						 
						
							
							
								
								Resolve conflict  
							
							 
							
							
							
						 
						
							2014-05-09 08:56:04 +02:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								6c48e9bbdf 
								
							 
						 
						
							
							
								
								Simplify config  
							
							 
							
							
							
						 
						
							2014-05-09 08:53:21 +02:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								7f1b916f32 
								
							 
						 
						
							
							
								
								Fix output  
							
							 
							
							
							
						 
						
							2014-05-09 08:53:21 +02:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								d8e68bc0e1 
								
							 
						 
						
							
							
								
								No output needed  
							
							 
							
							
							
						 
						
							2014-05-09 08:53:07 +02:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								9f6965c1b5 
								
							 
						 
						
							
							
								
								Add scenario for sorting by title  
							
							 
							
							
							
						 
						
							2014-05-09 08:51:57 +02:00  
						
					 
				
					
						
							
							
								 
								Aaron Broder
							
						 
						
							 
							
							
							
							
								
							
							
								f68098c7fc 
								
							 
						 
						
							
							
								
								Add test for using where filter on collections  
							
							 
							
							
							
						 
						
							2014-05-08 12:04:54 -07:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								5c109ee8dc 
								
							 
						 
						
							
							
								
								Merge pull request  #2299  from penibelst/sort-nils  
							
							 
							
							
							
						 
						
							2014-05-06 16:49:40 -05:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								7c1709fab4 
								
							 
						 
						
							
							
								
								Change nils argument to string  
							
							 
							
							
							
						 
						
							2014-05-06 21:36:13 +02:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								ea054ef149 
								
							 
						 
						
							
							
								
								Add test for document.output.  
							
							 
							
							... 
							
							
							
							Test for ref: 00f21ee93c 
Closes  #2232 . 
							
						 
						
							2014-05-06 15:27:13 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								3755437d08 
								
							 
						 
						
							
							
								
								Write test for site.documents.  
							
							 
							
							
							
						 
						
							2014-05-06 00:11:35 -04:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								12d9f8b02b 
								
							 
						 
						
							
							
								
								Add scenario for ordering pages without title last  
							
							 
							
							
							
						 
						
							2014-05-05 10:49:29 +02:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								367a818c26 
								
							 
						 
						
							
							
								
								Fallback title based on time  
							
							 
							
							
							
						 
						
							2014-05-05 10:37:21 +02:00  
						
					 
				
					
						
							
							
								 
								Anatol Broder
							
						 
						
							 
							
							
							
							
								
							
							
								3517b9f4e2 
								
							 
						 
						
							
							
								
								Add scenario  
							
							 
							
							
							
						 
						
							2014-05-05 10:35:19 +02:00  
						
					 
				
					
						
							
							
								 
								Robin Dupret
							
						 
						
							 
							
							
							
							
								
							
							
								3a610882f6 
								
							 
						 
						
							
							
								
								Avoid duplicated output using highlight tags  
							
							 
							
							... 
							
							
							
							While using Rouge and an `highlight` tag, the output was duplicated
since the `output` variable in the Liquid tag definition was equal to
the highlighter's prefix value and the `<<` method changes its receiver.
Therefore, we should simply define an empty string and append the prefix
if it is present. 
							
						 
						
							2014-04-27 12:22:40 +02:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								6225073095 
								
							 
						 
						
							
							
								
								Use the 'output' key instead of 'write' for writing out collections' document files.  
							
							 
							
							
							
						 
						
							2014-04-25 19:47:35 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								2ccf7f1cfb 
								
							 
						 
						
							
							
								
								Run jekyll build in features (must give subcommand)  
							
							 
							
							
							
						 
						
							2014-04-25 13:04:56 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								c906dfdf71 
								
							 
						 
						
							
							
								
								TEST THE COLLECTIONS  
							
							 
							
							
							
						 
						
							2014-04-24 14:01:23 -04:00  
						
					 
				
					
						
							
							
								 
								Martin Charles
							
						 
						
							 
							
							
							
							
								
							
							
								f9375d5660 
								
							 
						 
						
							
							
								
								Cleaned up cucumbers  
							
							 
							
							
							
						 
						
							2014-04-23 13:40:21 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								9db5a1a6ce 
								
							 
						 
						
							
							
								
								Merge pull request  #2205  from jekyll/maul-esel-frontmatter-defaults  
							
							 
							
							
							
						 
						
							2014-04-21 23:01:05 -04:00  
						
					 
				
					
						
							
							
								 
								Matt Rogers
							
						 
						
							 
							
							
							
							
								
							
							
								22f7380abe 
								
							 
						 
						
							
							
								
								Change the feature to not use `page.name`  
							
							 
							
							... 
							
							
							
							Use `page.description` in the cucumber feature instead. `page.name`
isn't overridable anymore. 
							
						 
						
							2014-04-15 20:15:16 -05:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								5a6f1d42a9 
								
							 
						 
						
							
							
								
								Fix #filtered_entries so it returns a new Array if the directory doesn't exist  
							
							 
							
							
							
						 
						
							2014-04-14 23:03:19 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								f0e68d7d86 
								
							 
						 
						
							
							
								
								Expose collections as site.<collection_name> in Liquid as array of docs.  
							
							 
							
							
							
						 
						
							2014-04-14 22:46:21 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								37a7236e20 
								
							 
						 
						
							
							
								
								Homagah it all renders I think.  
							
							 
							
							
							
						 
						
							2014-04-14 22:46:21 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								75f49a751e 
								
							 
						 
						
							
							
								
								OMG COLLECTIONS ARE RENDERING CALL THE POLICE  
							
							 
							
							
							
						 
						
							2014-04-14 22:46:21 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								7fef0302a7 
								
							 
						 
						
							
							
								
								Strike duplicate methods & :collection_name filler  
							
							 
							
							
							
						 
						
							2014-04-14 22:45:20 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								f082eca791 
								
							 
						 
						
							
							
								
								GUYS failing test for rendering  
							
							 
							
							
							
						 
						
							2014-04-14 22:45:20 -04:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								2804e08908 
								
							 
						 
						
							
							
								
								delete old superfluous tests; extend feature  
							
							 
							
							
							
						 
						
							2014-04-07 16:22:04 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								1997281449 
								
							 
						 
						
							
							
								
								Add feature for the "--unsupported" flag  
							
							 
							
							... 
							
							
							
							Also make step definitions a little more generic. 
							
						 
						
							2014-04-07 16:22:04 +02:00  
						
					 
				
					
						
							
							
								 
								maul.esel
							
						 
						
							 
							
							
							
							
								
							
							
								eded314bb1 
								
							 
						 
						
							
							
								
								add a cucumber feature to test "published" for pages  
							
							 
							
							
							
						 
						
							2014-04-07 16:13:20 +02:00  
						
					 
				
					
						
							
							
								 
								Marcus Stollsteimer
							
						 
						
							 
							
							
							
							
								
							
							
								fec6b59950 
								
							 
						 
						
							
							
								
								Use File.exist? instead of deprecated File.exists?  
							
							 
							
							
							
						 
						
							2014-04-06 13:31:34 +02:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								6bd07501e8 
								
							 
						 
						
							
							
								
								Merge branch 'frontmatter-defaults' of git://github.com/maul-esel/jekyll into maul-esel-frontmatter-defaults  
							
							 
							
							... 
							
							
							
							* 'frontmatter-defaults' of git://github.com/maul-esel/jekyll:
  move self.type to convertible
  oops, fix minor indentation quirk
  document frontmatter defaults precedence
  adjust frontmatter defaults precedence handling
  change cucumber feature to test for precedence too
  fix frontmatter defaults for custom paths
  more robust cucumber features
  fix slash handling for paths
  move cucumber features to own file
  fix minor docs quirk
  improve path checking, now using Pathname instead of regex
  Add site documentation for the new feature
  add inline code docs
  improve validation code
  fix for Ruby 1.8
  Add basic cucumber features for frontmatter defaults
  Retrieve frontmatter defaults when retrieved internally
  make frontmatter defaults available to liquid
  add a class `FrontmatterDefaults` for handling of frontmatter defaults
  Add a method to retrieve type to post, page and draft
Conflicts:
	lib/jekyll.rb
	lib/jekyll/convertible.rb
	lib/jekyll/core_ext.rb
	lib/jekyll/page.rb
	lib/jekyll/post.rb 
							
						 
						
							2014-04-04 15:32:27 -04:00  
						
					 
				
					
						
							
							
								 
								Daniel Schauenberg
							
						 
						
							 
							
							
							
							
								
							
							
								81e4e1d8f4 
								
							 
						 
						
							
							
								
								add support for unpublished drafts  
							
							 
							
							... 
							
							
							
							I keep all my ideas for blog posts as drafts in my draft folder. However I'm
only really working on a couple at once. This let's me mark drafts that I'm
not working on right now as unpublished so they don't clutter the site while
I'm checking on the other drafts. 
							
						 
						
							2014-03-22 19:52:10 -04:00  
						
					 
				
					
						
							
							
								 
								Parker Moore
							
						 
						
							 
							
							
							
							
								
							
							
								53c42d000f 
								
							 
						 
						
							
							
								
								Move test dir to inside tmp in this repo.  
							
							 
							
							
							
						 
						
							2014-03-18 23:53:31 -04:00  
						
					 
				
					
						
							
							
								 
								Slava Pavlutin
							
						 
						
							 
							
							
							
							
								
							
							
								6eef4b65ff 
								
							 
						 
						
							
							
								
								Remove redundant whitespace in a Cucumber feature  
							
							 
							
							
							
						 
						
							2014-03-01 23:32:30 +04:00  
						
					 
				
					
						
							
							
								 
								Slava Pavlutin
							
						 
						
							 
							
							
							
							
								
							
							
								2f79262f80 
								
							 
						 
						
							
							
								
								Fix tables alignments in Cucumber features  
							
							 
							
							
							
						 
						
							2014-03-01 23:10:05 +04:00