Commit Graph

1115 Commits

Author SHA1 Message Date
Parker Moore
35868807c1 Ensure leading slashes in path matching. 2014-01-05 10:54:52 -08:00
Parker Moore
42fc5e9ee7 Excludes should be relative to the site source 2014-01-05 10:45:42 -08:00
Matt Rogers
883e16acde Merge pull request #1910 from pborreli/typos 2014-01-04 08:12:20 -08:00
Matt Rogers
a33e86630d Merge pull request #1899 from soimort/preview-404 2014-01-04 08:04:20 -08:00
Pascal Borreli
bdda3a8ef6 Fixed typos 2014-01-04 14:17:38 +00:00
Parker Moore
6ca731c13b Use idiomatic #is_a? method instead of #class == 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
Mort Yao
99b36c7c30 Routing 404 errors to custom 404 page for development server 2014-01-03 03:23:46 +01:00
Ahmed Hazem
fdcf1f4526 Add --quiet flag 2014-01-01 18:50:27 +02: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
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
1a3a607fcf Merge pull request #1831 from jekyll/default-maruku-fenced-code-blocks 2013-12-25 22:14:23 -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
ebaa484294 Merge pull request #1866 from colindean/patch-2 2013-12-25 22:06:34 -08:00
Parker Moore
ab95cca434 Add TomDoc for Jekyll::Converters::Markdown#allowed_custom_class? 2013-12-26 00:33:34 -05:00
Parker Moore
7b9984699c Fix error in exception message in Markdown Converter [ci skip] 2013-12-26 00:14:24 -05:00
Parker Moore
60b43104ee Extract checks for acceptable custom markdown processors to method.
We should probably write more about what it does and how it works in a TomDoc block above.
@envygeeks, want to give that a shot?
2013-12-26 00:02:56 -05:00
Jordon Bedwell
a206dc1a8f Use downcase. 2013-12-25 23:55:20 -05: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
Garen Torikian
31bebf0f9e Depend on Jekyll.logger.error, not $stderr 2013-12-25 19:36:49 -06:00
Jordon
c759a7a75f Allow custom Markdown processors. 2013-12-25 19:36:25 -06:00
Jordon
626d54a812 New is implied by raise, 2nd is the message. 2013-12-25 19:36:25 -06:00
Jordon
4d017b4fed Use $stderr, not STDERR, $stderr points to STDERR. 2013-12-25 19:36:25 -06:00
Robin Dupret
036cbda2f6 Require at least 1.3.0 for Rouge
Rouge 1.3.0 introduced a `rouge_formatter` helper which is handy to
overwrite the formatter default when using the Redcarpet plugin so let's
require this version at the very least.

An abort statement will be thrown when the installed version is not
correct.
2013-12-25 18:06:29 +01:00
Parker Moore
9d5785cead Merge pull request #1847 from schneems/schneems/better-bat-time-error 2013-12-24 11:05:34 -08:00
Colin Dean
88686e759e Add path to required methods
The error messages in this module call `#path`, but the module does not require the `path` method to be implemented. This change documents that classes which include `Convertible` must define `path`.

See #1846 for discussion.
2013-12-23 12:56:02 -05:00
Robin Dupret
3ca2cb0119 Fix various typos and improve the doc 2013-12-23 13:03:29 +01:00
Robin Dupret
cab9047de1 Set the wrap option to false when using Rouge
Since Rouge yields the pre tag with a class attribute but we don't want
it, we should set the wrap parameter to false when instantiating a new
formatter object.

Also use Rouge::Formatter#format instead of #render which is deprecated
and will be removed in the near future.
2013-12-23 13:03:24 +01:00
Aidan Feldman
fa8618879d Merge remote-tracking branch 'upstream/master' into sort-attributes 2013-12-22 19:31:56 -05:00
Robin Dupret
bd442680ea Rely on the Redcarpet plugin instead of hard-coding
To avoid code duplication and have to keep tracking of the API change of
Rouge, let's rely on the Redcarpet plugin and customize the output on
our needs.
2013-12-22 18:45:46 +01: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
c2b750448e allow data attribute access by Liquid on Convertible items 2013-12-19 17:14:51 -05:00
Jens Nazarenus
10ee83d680 edited raise message when validating included file 2013-12-19 18:23:21 +01:00
Aidan Feldman
3c1d45f45f Sort pages by name by default
The order that files are returned differs across operating systems, so
ensure that they're being sorted after the fact.
2013-12-19 01:02:25 -05:00
schneems
22017d085b Better error message when time is not parseable
Give the full path of the file that cannot be parsed so the user can locate it easier. Follow up the error message with helpful instructions: they can resolve the error by fixing the date or excluding the file or directory from being processed.
2013-12-18 16:14:21 -06:00
Jens Nazarenus
43ef9a2e4f variables in include tag with filters 2013-12-17 23:51:52 +01:00
akira yamada
ecab2eb473 made error description more helpful 2013-12-17 10:57:12 +09:00
Parker Moore
1ebce26881 Default Maruku fenced_code_blocks to ON.
Extends https://github.com/jekyll/jekyll/pull/1799
2013-12-15 16:08:21 -05:00
akira yamada
9d259fe315 added error description for invalid post name 2013-12-15 17:18:11 +09:00
akira yamada
a5545d5bad post_url tag raises ArgumentError for invalid name
Using post_url tag with invalid name raises TypeError.

It should raise ArgumentError and should display detail of the error to
fix the error.
2013-12-14 22:30:22 +09:00
Parker Moore
6195192bcf mojombo/jekyll ~> jekyll/jekyll 2013-12-11 17:44:33 -05:00
Matt Rogers
39b6fe732f Merge pull request #1780 from mojombo/kill-1-8 2013-12-11 06:08:10 -08:00
Matt Rogers
6efb726e2b Merge pull request #1805 from ivantsepp/scaffold_vertical_scrollbar 2013-12-10 20:58:45 -08:00
Matt Rogers
a7d4ee8bfb Merge pull request #1799 from konklone/maruku_fenced_code_blocks 2013-12-10 20:30:44 -08:00
Ivan Tse
b18f6505dd Remove margin-top of .site to prevent collapsing margins. 2013-12-10 18:39:16 -05:00
Parker Moore
a70726e554 Merge pull request #1788 from mojombo/group-by-filter-2 2013-12-10 08:48:44 -08:00