Commit Graph

6306 Commits

Author SHA1 Message Date
Parker Moore 7a284b802b Update history to reflect merge of #4181
[ci skip]
2015-11-24 17:33:33 -08:00
Parker Moore 79380e86fa Merge pull request #4181 from jekyll/bump-cucumber
Merge pull request 4181
2015-11-24 17:33:15 -08:00
Parker Moore 1bde4ce84a include_tag.feature: double escape 2015-11-24 17:11:47 -08:00
Parker Moore 8a09418083 Allow use of Cucumber 2.1 or greater 2015-11-24 16:28:02 -08:00
Parker Moore d7bac8cc40 Update history to reflect merge of #4160
[ci skip]
2015-11-24 16:19:58 -08:00
Parker Moore ac1b2b88d4 Merge pull request #4160 from jekyll/fix-html-htm-xhtml-pages
Merge pull request 4160
2015-11-24 16:19:46 -08:00
Parker Moore 934273ad92 Update history to reflect merge of #4180
[ci skip]
2015-11-24 15:18:28 -08:00
Parker Moore 20f5434692 Merge pull request #4180 from untra/fix/#4178
Merge pull request 4180
2015-11-24 15:17:29 -08:00
Parker Moore 1c42a8225e Update history to reflect merge of #4179
[ci skip]
2015-11-24 15:04:19 -08:00
Parker Moore 3a4621870a Merge pull request #4179 from vwochnik/patch-1
Merge pull request 4179
2015-11-24 15:03:36 -08:00
Sam Volin 35070d6806 added debug message to collection 2015-11-24 16:02:10 -07:00
Vincent Wochnik 6739072fb2 Update plugins.md
Add `jekyll-deploy` plugin.
2015-11-24 22:39:07 +01:00
Jordon Bedwell 256212649a Update mime-types. 2015-11-24 04:26:05 -06:00
Jordon Bedwell 95203d99ba Update History.markdown 2015-11-24 04:20:44 -06:00
Jordon Bedwell f7a2b52cd9 Merge pull request #4174 from gfxmonk/master
Fix #4173: Rename @options so that it does not impact Liquid.
2015-11-24 04:19:57 -06:00
Tim Cuthbertson a7730914df rename `@options` in HighlightBlock (clash with Liquid::Block). fixes #4173 2015-11-24 20:24:44 +11:00
Parker Moore 3417a33e7a Update templates docs to reflect Rouge default.
Fixes #3323
2015-11-23 08:37:57 -08:00
Parker Moore bf66d1fc23 Upgrading 2-3: note that default syntax highlighter changed.
Fixes #4176
2015-11-23 08:29:18 -08:00
Parker Moore 2011addabc Update history to reflect merge of #4177
[ci skip]
2015-11-23 08:25:06 -08:00
Parker Moore 6814bc8e63 Merge pull request #4177 from rebornix/FixCleanCommandOptions
Merge pull request 4177
2015-11-23 08:24:44 -08:00
rebornix 16aea22c8d pass build options into clean command 2015-11-23 22:38:45 +08:00
Parker Moore c4fe2b0513 Update pagination docs to reflect removal of pagination as runtime dep.
Fixes #4171
2015-11-20 10:51:16 -08:00
Jordon Bedwell 10b147f429 Update history.markdown to reflect the merger of #4169. 2015-11-19 19:28:27 -06:00
Jordon Bedwell 547de56c19 Merge pull request #4169 from vwochnik/patch-1
Update plugins.md
2015-11-19 19:27:35 -06:00
Jordon Bedwell 9ea8129d85 Update history.markdown to reflect the merger of #4168 2015-11-19 19:27:21 -06:00
Jordon Bedwell 275aea11d1 Merge pull request #4168 from jekyll/pr/cleanup-url-sanitize
Slightly speed up url sanitization and handle multiples of ///.
2015-11-19 19:26:31 -06:00
Vincent Wochnik 2c04321d5a Update plugins.md
I have written a liquid filter to make email protection for static websites easy. This plugin contains the `protect_email` filter which encodes email addresses similar to the way GitHub does for the user profiles.
2015-11-20 01:55:39 +01:00
Jordon Bedwell 487d9ffc21 Slightly speed up url sanitization and handle multiples of ///. 2015-11-19 18:46:03 -06:00
Parker Moore 20a78dcca0 Update history to reflect merge of #4157
[ci skip]
2015-11-19 09:25:28 -08:00
Parker Moore 58c9a070a7 Merge pull request #4157 from jekyll/upgrading-to-3.0
Merge pull request 4157
2015-11-19 09:25:17 -08:00
Jordon Bedwell 5d8be167d9 Update history.markdown to reflect the merger of #4163 2015-11-19 06:57:52 -06:00
Jordon Bedwell 22a9fbb2a1 Merge pull request #4163 from paulrobertlloyd/master
Add three plugins to directory
2015-11-19 06:56:50 -06:00
ducksan cho e9f8b4df74 Add Windows support to Utils.safe_glob 2015-11-19 17:15:51 +13:00
Paul Robert Lloyd 0ef5ab352d Add jekyll-figure to plugin directory 2015-11-19 00:48:51 +00:00
Paul Robert Lloyd a729a1f086 Add jekyll-typogrify to plugin directory 2015-11-19 00:47:03 +00:00
Paul Robert Lloyd a95e5f16f0 Add jekyll-roman to plugin directory 2015-11-19 00:44:49 +00:00
Jordon Bedwell 90865d5fc1 Fix #4082: Allow users to use .htm and .xhtml (XHTML5.) 2015-11-18 16:02:03 -06:00
Parker Moore 970edaf238 Update history to reflect merge of #4120
[ci skip]
2015-11-18 11:53:33 -08:00
Parker Moore c1761bc478 Merge pull request #4120 from rebornix/CacheIncludeTemplate
Merge pull request 4120
2015-11-18 11:53:10 -08:00
Parker Moore b01b089f69 rake site:preview should also run :history and :version_file [ci skip] 2015-11-18 08:59:55 -08:00
Parker Moore 61aff2c547 Add more resources for MathJax integration.
Fixes #4146.
2015-11-18 08:58:34 -08:00
Parker Moore 0cdf659ebf Add upgrading docs from 2.x to 3.x 2015-11-18 08:50:49 -08:00
Ducksan Cho 20735e12f9 Use safe_glob to unsafe glob 2015-11-19 01:02:48 +13:00
Ducksan Cho a168edae45 Add Utils.safe_glob method
which works the same way as Dir.glob but seperating the input
into two parts ('dir' + '/' + 'pattern') to make sure
the first part('dir') does not act as a pattern.
2015-11-19 00:46:46 +13:00
Parker Moore cae8bd31c2 Update history to reflect merge of #4152
[ci skip]
2015-11-17 22:42:06 -08:00
Parker Moore ed0c08c7f6 Merge pull request #4152 from jekyll/jekyll-docs
Merge pull request 4152
2015-11-17 22:41:18 -08:00
Parker Moore 1dcb1e9fd7 site/latest_version.txt is 3.0.1 homiez 2015-11-17 22:40:14 -08:00
Parker Moore 6448c0e6a1 jekyll-docs gem should be easily integrated with jekyll's site. 2015-11-17 22:39:55 -08:00
Parker Moore 2b4a3c008d Release 💎 3.0.1 2015-11-17 22:19:45 -08:00
Parker Moore 9bc926be3f Update history to reflect merge of #4100
[ci skip]
2015-11-17 22:04:15 -08:00