Commit Graph

5092 Commits

Author SHA1 Message Date
Parker Moore e0a011c917 Update history to reflect merge of #3185 [ci skip] 2014-12-29 00:52:47 -05:00
Parker Moore 63ec07a062 Merge pr #3185.
add link to tutorial on building dynamic navbars

Conflicts:
	site/_docs/resources.md
2014-12-29 00:51:47 -05:00
Parker Moore 5f03314d85 Update history to reflect merge of #3186 [ci skip] 2014-12-29 00:50:57 -05:00
Parker Moore 442deb6a7e Merge pull request #3186 from eduardoboucas/master 2014-12-29 00:50:24 -05:00
Parker Moore d7d7d924f7 Update history to reflect merge of #3189 [ci skip] 2014-12-29 00:50:12 -05:00
Parker Moore 35a5af783a Merge pull request #3189 from robschia/patch-1 2014-12-29 00:49:40 -05:00
Parker Moore a6781bda30 Always, always rebuild (by default) in tests. 2014-12-29 00:37:16 -05:00
Parker Moore bab7ef4b1d Use backticks here. [ci skip]. 2014-12-29 00:32:14 -05:00
Parker Moore 6f7ea381b3 Update history to reflect merge of #3047 [ci skip] 2014-12-29 00:31:53 -05:00
Parker Moore 612eb737a5 Merge pull request #3047 from karouf/slugify-non-latin 2014-12-29 00:31:34 -05:00
Parker Moore 191c2279d2 Update history to reflect merge of #2908 [ci skip] 2014-12-29 00:26:58 -05:00
Parker Moore e39dfa3f0b Merge pull request #2908 from alfredxing/document-path 2014-12-29 00:26:35 -05:00
Parker Moore 5af7694f3b Update history to reflect merge of #2790 [ci skip] 2014-12-29 00:23:57 -05:00
Parker Moore 6e5850c6ab Merge PR #2790.
Add jekyll-thumbnail-filter to plugins list
2014-12-29 00:22:55 -05:00
Parker Moore be23e18555 Say 'since 2.0' 2014-12-28 23:54:03 -05:00
Parker Moore eac3ac095f Update history to reflect merge of #3240 [ci skip] 2014-12-28 23:36:37 -05:00
Parker Moore aa4beda868 Merge pull request #3240 from jekyll/snake_case 2014-12-28 23:36:08 -05:00
Parker Moore 1fad3a074f Update history to reflect merge of #3241 [ci skip] 2014-12-28 23:35:54 -05:00
Parker Moore 0fe2094dd2 Merge pull request #3241 from jekyll/separate-jekyll-docs 2014-12-28 23:35:36 -05:00
Parker Moore c576d23908 Use External instead of Deprecator for requiring gracefully 2014-12-28 14:37:49 -05:00
Parker Moore 8c19a6f430 Print an error message in bin/jekyll with no arguments 2014-12-28 14:37:14 -05:00
Parker Moore ac41312c5d Separate jekyll-docs out into a separate gem & bless it 2014-12-28 14:37:02 -05:00
Parker Moore 232a58d5b4 Fix test use of Site#getConverterImpl. 2014-12-28 14:14:24 -05:00
Parker Moore 0c0aea3ad7 Improve Site#getConverterImpl and call it Site#find_converter_instance 2014-12-28 14:12:09 -05:00
Parker Moore 657b16519e Update history to reflect merge of #3204 [ci skip] 2014-12-26 23:10:21 -05:00
Parker Moore f81601ee53 Merge pull request #3204 from jekyll/sort-static-files-once 2014-12-26 23:05:04 -05:00
Parker Moore b6641be8ef Call it site_payload instead of payload. 2014-12-26 22:40:18 -05:00
Parker Moore a8ec9cd507 Put the development dependencies in the Gemfile directly. 2014-12-26 22:37:56 -05:00
Parker Moore 2f8248a6f1 Only call #site_payload once for all collection work. 2014-12-26 22:24:18 -05:00
Parker Moore 0eb2796a66 Sort static files just once.
Ref: #2075.
2014-12-26 22:23:45 -05:00
Parker Moore e120c255ff Update history to reflect merge of #3237 [ci skip] 2014-12-26 22:22:36 -05:00
Parker Moore 990a9e6e6d Merge pull request #3237 from jekyll/enable_coderay 2014-12-26 22:22:15 -05:00
Parker Moore c24c6b7f3d Use 'enable_coderay' in the tests. 2014-12-26 22:17:33 -05:00
Parker Moore 039c521e8c Update the documentation. 2014-12-26 22:17:07 -05:00
Parker Moore d35af9c1f3 Read 'enable_coderay' in the Kramdown parser 2014-12-26 22:16:57 -05:00
Parker Moore f6bff6fb61 Have a deprecation fallback for 'use_coderay' 2014-12-26 22:16:47 -05:00
Parker Moore a103898980 Set 'use_coderay' to 'enable_coderay' 2014-12-26 22:16:33 -05:00
Parker Moore 3957efac15 Update history to reflect merge of #3002 [ci skip] 2014-12-26 22:00:45 -05:00
Parker Moore 38309569c4 Merge pull request #3002 from jekyll/liquid-3 2014-12-26 22:00:33 -05:00
Parker Moore 8bfc696569 liquid-c 0.0.3 2014-12-26 21:53:56 -05:00
Parker Moore b68dd3a5cb Add liquid c if it's available. 2014-12-26 21:53:56 -05:00
Parker Moore 3940e1e9df Bump to Liquid 3.0 2014-12-26 21:53:56 -05:00
Parker Moore 70a331d854 Set the error mode to :strict 2014-12-26 21:53:56 -05:00
Parker Moore 5bf1596414 Refactor Highlight tag tests to use a helper method to create the tag. 2014-12-26 21:53:56 -05:00
Parker Moore 3234041510 Update history to reflect merge of #3235 [ci skip] 2014-12-26 16:46:57 -05:00
Parker Moore 37631eefac Merge pull request #3235 from jekyll/drop-ruby-1-9 2014-12-26 16:46:38 -05:00
Parker Moore 82b1ad0552 Update history to reflect merge of #3236 [ci skip] 2014-12-26 16:35:56 -05:00
Parker Moore 2c2347fac1 Merge pull request #3236 from tkrotoff/remove-end-tag 2014-12-26 16:35:33 -05:00
Tanguy Krotoff 0aa61f66a8 Remove unneeded end tag 2014-12-26 12:10:03 +01:00
Parker Moore 6e4e290ab0 Requires >= 2.0.0 2014-12-25 16:11:14 -05:00