Commit Graph

439 Commits

Author SHA1 Message Date
Parker Moore d43341fab0 Merge pull request #2009 from penibelst/test-sass-include 2014-02-13 17:56:38 -05:00
Parker Moore dd3018ce02 Merge pull request #1988 from jekyll/maruku-to-kramdown 2014-02-08 17:07:54 -05:00
Parker Moore 22f2001ff5 Set default markdown converter to Kramdown
- Update default markdown converter in docs for configuration
- Update tests so they are in line with Kramdown output
- Add deprecation message to when config is built
2014-02-08 13:17:46 -05:00
Anatol Broder c17ed7ec93 Add comment about symlinked directories 2014-02-08 13:26:03 +01:00
Matt Rogers & Persa Zula facf115c04 Move layout tests from site to its own file 2014-02-06 22:45:51 -06:00
Anatol Broder 487e7a7137 Make sort test run 2014-02-04 09:23:00 +01:00
Anatol Broder 9e4dea14e4 Fix partial test 2014-02-04 02:03:14 +01:00
Anatol Broder 8e0a826cc7 Fix group_by_filter test by adding 2 items 2014-02-04 01:31:37 +01:00
Anatol Broder e36f9d7da8 First draft 2014-02-04 01:26:28 +01:00
Matt Rogers 5edb4c6bfd Merge pull request #1982 from dtao/safe-yaml-no-clobber 2014-01-31 06:48:16 -08:00
Parker Moore fdbfd719ca Add CoffeeScript converter. 2014-01-25 20:38:51 -05:00
Matt Rogers 5b7a53b543 Merge pull request #1932 from jekyll/sass 2014-01-24 15:18:06 -08:00
Parker Moore 774bf96c61 Merge master into sass 2014-01-24 12:17:35 -05:00
Dan Tao fafacef0a0 added a test that YAML.load doesn't get clobbered
I THINK this is a good idea? I considered multiple approaches to testing this;
what I like about this dumb way (just try to deserialize a symbol) is that it's
nice and simple.
2014-01-23 17:42:14 -08:00
Dan Tao 4f0b1bdf6d switched from YAML.safe_load* to SafeYAML.load* 2014-01-23 17:25:17 -08:00
Matt Rogers 98857832cd Merge pull request #1931 from liufengyun/published 2014-01-22 05:38:04 -08:00
liufengyun 22e1e5f28c make sure pages with published being false are not generated 2014-01-19 09:52:19 +08:00
Jens Nazarenus 82bee23bd0 added tests for full path leak to source directory when using include tag 2014-01-16 18:43:25 +01:00
Matt Rogers 10e5ecfe53 Improve the test description for the outputs_ext test 2014-01-15 23:04:52 -06:00
Matt Rogers 824d9f6ca8 Better express that the converter always outputs css 2014-01-15 22:49:33 -06:00
Parker Moore 2966606b1a Add docs about the 'new' restriction on excludes. 2014-01-13 00:17:12 -08:00
Parker Moore 4afe39e461 Allow caching in unsafe mode, but disable in safe mode. 2014-01-12 21:36:08 -08:00
Parker Moore ecf85a9cfa Does not allow caching.
This was done to prevent putting the .sass-cache folder in bad places. Needed? cc @benbalter.
2014-01-12 21:30:30 -08:00
Parker Moore 8ecd2d9218 Don't allow path traversal or syntax overrides. 2014-01-12 21:30:30 -08:00
Parker Moore 4784d1de18 Build Sass configuration options. 2014-01-12 21:30:30 -08:00
Parker Moore 22d4e2aa90 Consolidate into one master 'Sass' converter. 2014-01-12 21:30:29 -08:00
Parker Moore 4da7223831 Fixes for Sass/SCSS converters. 2014-01-12 21:30:29 -08:00
Parker Moore 331c7adc08 Move #glob_include? from core_ext to entry_filter 2014-01-08 20:24:21 -08:00
Parker Moore 366f9268ee Add tests for new exclude behaviour. 2014-01-05 11:01:51 -08:00
Parker Moore a5f1bc0341 Fixed the tests... I guess Hash literals aren't ok. 2014-01-03 21:23:02 -08:00
Parker Moore b4383a5c42 Flesh out tests for where filter for @mattr- 😃 2014-01-03 21:23:02 -08:00
Ben Balter 39e4d6b3ba add where filter to filter arrays of objects 2014-01-03 21:23:02 -08:00
Parker Moore c7b649f792 Update test_generated_site.rb to know about new post 2014-01-01 19:53:42 -08:00
Matt Rogers 012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Matt Rogers a2fd8ba7c3 Merge pull request #1849 from afeld/sort-attributes 2013-12-30 20:31:45 -08:00
Meeka 1da8f04aaa Removes assert_includes to pass Travis 2013-12-30 12:57:23 -05:00
Meeka 9652b7ef80 adds to_s method testing on Excerpt 2013-12-30 12:23:41 -05:00
Meeka 3a0733deb9 Adds tests for the Excerpt include?, id, and inspect methods 2013-12-30 12:15:13 -05:00
Parker Moore 791c6d815d Merge pull request #1825 from arika/smallfix_post_url_tag_behavior_for_invalid_names 2013-12-25 22:32:50 -08:00
Parker Moore 6e8f31f406 Merge pull request #1841 from jens-na/include-variable-liquid-filters 2013-12-25 22:11:33 -08:00
Parker Moore c70350e275 Merge branch 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll into gjtorikian-steal-envygeeks-custom-markdown-processors
* 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll:
  Depend on Jekyll.logger.error, not $stderr
  Allow custom Markdown processors.
  New is implied by `raise`, 2nd is the message.
  Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 23:52:50 -05:00
Jordon c759a7a75f Allow custom Markdown processors. 2013-12-25 19:36:25 -06:00
Aidan Feldman 9d7c524530 fix file sorting test 2013-12-22 19:33:00 -05:00
Aidan Feldman fa8618879d Merge remote-tracking branch 'upstream/master' into sort-attributes 2013-12-22 19:31:56 -05:00
Robin Dupret 4bf716c2ad Set highlighter to pygments when upgrading
In case you are upgrading from 1.4.2 to 2.0 and the pygments option is
set to true, then the highlighter option will be set to pygments
automatically.
2013-12-22 18:45:46 +01:00
Robin Dupret 0831d2b0f8 Add support for the Rouge syntax highlighter
By setting the `highlighter` setting to `rouge` you can now easily
highlight your code with it instead of relying on Pygments. However,
Jekyll doesn't depend on Rouge explicitly, you will need to install it
or add it to your Gemfile.

The documentation has been updated accordingly.
2013-12-22 18:45:40 +01:00
Robin Dupret 92064134d6 Rename the pygments option to highlighter
Rename the pygments configuration option to highlighter to allow
different highlighters in the future. For now, the allowed values are
`pygments` and `null`.

It's now more straightforward to plug another syntax highlighter.
2013-12-22 12:45:15 +01:00
Aidan Feldman 2bfafb3b33 make non-data properties/methods accessible to Liquid
per https://github.com/jekyll/jekyll/pull/1849/files#r8490593
2013-12-22 03:38:32 -05:00
Aidan Feldman 45ee9f814a clarify page sorting test 2013-12-19 13:46:43 -05:00
Jens Nazarenus f9ffbe0d6a removed duplicate test scenario 2013-12-19 18:23:07 +01:00