Commit Graph

4529 Commits

Author SHA1 Message Date
Bret Comnes f29884593b Reverted deleted test and modified ensure subdirs are ignored. 2014-08-06 16:05:53 -07:00
Bret Comnes d0ac4915cb Reverts 18c033dc5c
The merge that is reverted assigned categories to posts
based on the subfolders in the _posts directory and 
was merged under the understanding that it was fixing a bug.

Subfolders in the _posts directory should not assign 
metadata information to posts at this point in time and 
was not a bug.
2014-08-06 14:20:03 -07:00
Parker Moore d004bc4ea5 Allow Convertibles to be converted by >= 1 converters. 2014-08-06 16:20:24 -04:00
Parker Moore b00c5e9587 Update history to reflect closing of #2456. [ci skip] 2014-08-06 16:02:22 -04:00
Parker Moore 229cedfc50 Reorganize and update default configuration settings. #2456. 2014-08-06 16:01:47 -04:00
Parker Moore 5796690827 Update history to reflect merge of #2682 [ci skip] 2014-08-06 15:31:20 -04:00
Parker Moore cb671acd0c Merge pull request #2682 from alfredxing/date-parser-util 2014-08-06 15:30:02 -04:00
Parker Moore 85bd3836d0 Update history to reflect merge of #2688 [ci skip] 2014-08-06 15:29:43 -04:00
Parker Moore a959c06e44 Merge pull request #2688 from barryclark/add_smashing_mag_tutorial_to_resources_page 2014-08-06 15:29:19 -04:00
Parker Moore 99a48499c7 Update history to reflect merge of #2693 [ci skip] 2014-08-06 15:28:32 -04:00
Parker Moore 21b6a01980 Merge pull request #2693 from ivantsepp/2142_partial_liquid_output_tag_in_include_tag 2014-08-06 15:28:07 -04:00
Parker Moore df91299550 Update history to reflect merge of #2696 [ci skip] 2014-08-06 15:27:26 -04:00
Parker Moore 5eacc9e831 Merge pull request #2696 from jekyll/jekyll-autogeneration-disabled 2014-08-06 15:27:16 -04:00
Parker Moore 9e679e7d4a Update history to reflect merge of #2687 [ci skip] 2014-08-06 15:24:16 -04:00
Parker Moore f0105158bf Merge pull request #2687 from kleinfreund/sassify_site_template 2014-08-06 15:24:01 -04:00
kleinfreund 8999df2f46 Adding markdown setting back to _config.yml 2014-08-06 21:12:36 +02:00
kleinfreund 441a2496b8 Usind 3 instead of 7 SCSS files now 2014-08-06 19:20:06 +02:00
kleinfreund e5a7f842be Add sentence about jekyll-help repo 2014-08-06 19:11:36 +02:00
kleinfreund 7f92e7ce00 Reverting back to using content box and calc 2014-08-06 11:08:28 +02:00
Parker Moore b3069c0802 Update history to reflect merge of #2697 [ci skip] 2014-08-05 17:02:03 -04:00
Parker Moore f39c2610ee Merge pull request #2697 from jekyll/classifier-fix 2014-08-05 17:01:50 -04:00
Parker Moore 4c4f803df2 Remove preemptive loading of the 'classifier' gem. 2014-08-05 16:47:30 -04:00
Parker Moore a27313b1d0 Use helper method #deprecation_message in Deprecator.no_subcommand. 2014-08-05 16:43:38 -04:00
Parker Moore 9fd872e7b8 Notify the user when auto-regeneration is disabled. 2014-08-05 15:55:43 -04:00
Parker Moore 6ca8baa572 Update history to reflect merge of #2694 [ci skip] 2014-08-05 15:02:24 -04:00
Parker Moore 018390cf64 Merge pull request #2694 from MartinSeeler/patch-1 2014-08-05 15:01:53 -04:00
Martin Seeler 13425266eb Fixed Typo in error message 2014-08-05 15:37:09 +02:00
kleinfreund 738dd502b4 Adding fill attribute to SVG's as fallback 2014-08-05 09:46:39 +02:00
Ivan Tse 0594adb8fd Allow VARIABLE_SYNTAX to collect partial variables 2014-08-05 01:04:36 -04:00
Ivan Tse 83f726f503 Add tests for include tag with partial variables 2014-08-05 01:04:20 -04:00
Parker Moore 36006fa68a Update history to reflect merge of #2689 [ci skip] 2014-08-04 22:05:38 -04:00
Parker Moore a49244f4dd Merge pull request #2689 from minad/patch-1 2014-08-04 22:05:04 -04:00
kleinfreund 020f684093 Adjusting heading hierarchy to reflect site-title change 2014-08-04 09:42:46 +02:00
kleinfreund 101d614351 Removing h1 from site-title 2014-08-04 09:35:18 +02:00
Barry Clark af1cc06184 blockquote needs spaces before it 2014-08-03 19:14:39 -04:00
Barry Clark d1b9dfc6c9 Adds Smashing Magazine tutorial to resources page 2014-08-03 18:51:36 -04:00
kleinfreund d8c330b215 Removing unused column class 2014-08-03 23:15:22 +02:00
kleinfreund e4029426de Adding and using media-query mixin 2014-08-03 23:07:47 +02:00
kleinfreund 7d865269fd Replacing CSS comments with Sass comments 2014-08-03 23:06:59 +02:00
kleinfreund b24b870ec6 Update welcome post to clarify front matter usage 2014-08-03 23:06:14 +02:00
kleinfreund 74974979ba Reworking site template to utilize Sass 2014-08-03 19:35:43 +02:00
Daniel Mendler 4336e8e4b9 Link to jekyll-slim
Link to https://github.com/slim-template/jekyll-slim
2014-08-03 02:03:14 +02:00
Alfred Xing c7f8c70935 Add tests for `Utils.parse_date` method 2014-08-02 15:03:31 -07:00
Alfred Xing 4cfbdb07bb Show input in error message
Show date input in error message to make it easier for user
to find infringing date/file
2014-08-02 11:51:04 -07:00
Parker Moore 3e98860241 Update history to reflect merge of #2615 [ci skip] 2014-08-02 14:45:01 -04:00
Parker Moore 81807cb5af Merge pull request #2615 from alfredxing/collections-static-files 2014-08-02 14:44:45 -04:00
Alfred Xing d5322a73bf Move instances of `Time.parse` into a Utils method 2014-08-02 09:38:50 -07:00
Alfred Xing bd59fa14f3 Add tests for static files in collections 2014-08-02 09:00:03 -07:00
Alfred Xing 5fdf637c6a Cache information about document YAML header existence 2014-08-01 22:03:29 -07:00
Parker Moore 9a6dc7b520 Update history to reflect merge of #2649 [ci skip] 2014-08-02 00:09:18 -04:00