5cb38dc4d7
Fix typo. Change license link
2013-12-29 10:26:49 +01:00
60541437e3
Revert "Add license page"
...
This reverts commit 8e9437199c
2013-12-29 10:24:13 +01:00
95e4707fd1
Add Jekyll Team to the license text
2013-12-29 01:17:25 +01:00
8e9437199c
Add license page
2013-12-29 01:10:31 +01:00
ee8d509d39
Change footer
2013-12-29 00:49:48 +01:00
3744e70128
Raise restriction of safe_yaml to ~>1.0
...
Amends #1886
2013-12-28 13:47:35 -05:00
194109d677
Update history to reflect merge of #1886
2013-12-28 13:46:40 -05:00
3e4d47c21d
Merge pull request #1886 from ivantsepp/1845_bump_safe_yaml_version
2013-12-28 10:45:57 -08:00
9d5683dc71
Bump safe_yaml version to include the fix for dtao/safe_yaml#35
2013-12-28 02:42:48 -05:00
da8571beec
Update history to reflect merge of #1879
2013-12-26 15:23:28 -05:00
c53e8dbd6c
Merge pull request #1879 from jekyll/update-mercenary
2013-12-26 12:23:00 -08:00
d2314d360a
Bump mercenary to ~> 0.2.0
2013-12-26 14:34:28 -05:00
7093d3aa82
Update history to reflect merge of #1877
2013-12-26 02:02:42 -05:00
5f2e8b8ae4
Merge pull request #1877 from jekyll/maul-esel-consistent-opts
2013-12-25 23:02:13 -08:00
0e444b7843
make options consistent across commands
2013-12-26 02:00:26 -05:00
a2853456b6
Update history to reflect merge of #1825
2013-12-26 01:33:17 -05:00
791c6d815d
Merge pull request #1825 from arika/smallfix_post_url_tag_behavior_for_invalid_names
2013-12-25 22:32:50 -08:00
46e47e6713
Update history to reflect merge of #1831
2013-12-26 01:14:48 -05:00
1a3a607fcf
Merge pull request #1831 from jekyll/default-maruku-fenced-code-blocks
2013-12-25 22:14:23 -08:00
92c3d6d3fd
Update history to reflect merge of #1841
2013-12-26 01:12:40 -05:00
6e8f31f406
Merge pull request #1841 from jens-na/include-variable-liquid-filters
2013-12-25 22:11:33 -08:00
a60852df19
Merge pull request #1853 from jekyll/update-history-with-v1.4.x
2013-12-25 22:07:32 -08:00
fbf2b5734e
Update history to reflect merge of #1866
2013-12-26 01:07:01 -05:00
ebaa484294
Merge pull request #1866 from colindean/patch-2
2013-12-25 22:06:34 -08:00
0ebec0b03f
Update history to reflect merge of #1872
2013-12-26 01:06:02 -05:00
5c4831af49
Merge pull request #1872 from jekyll/gjtorikian-steal-envygeeks-custom-markdown-processors
2013-12-25 22:05:31 -08:00
58ae137945
Fix quick site bugs.
2013-12-26 01:02:13 -05:00
88612bf7ce
Add docs for custom markdown processors.
2013-12-26 00:52:20 -05:00
ab95cca434
Add TomDoc for Jekyll::Converters::Markdown#allowed_custom_class?
2013-12-26 00:33:34 -05:00
7b9984699c
Fix error in exception message in Markdown Converter [ci skip]
2013-12-26 00:14:24 -05:00
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
a206dc1a8f
Use downcase.
2013-12-25 23:55:20 -05:00
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
31bebf0f9e
Depend on Jekyll.logger.error, not $stderr
2013-12-25 19:36:49 -06:00
c759a7a75f
Allow custom Markdown processors.
2013-12-25 19:36:25 -06:00
626d54a812
New is implied by `raise`, 2nd is the message.
2013-12-25 19:36:25 -06:00
4d017b4fed
Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 19:36:25 -06:00
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
1550c60278
Update history to reflect merge of #1847
2013-12-24 14:05:54 -05:00
9d5785cead
Merge pull request #1847 from schneems/schneems/better-bat-time-error
2013-12-24 11:05:34 -08:00
169e526f2f
Update history to reflect merge of #1867
2013-12-24 14:05:00 -05:00
ec68acf958
Merge pull request #1867 from pootsbook/patch-2
2013-12-24 11:02:47 -08:00
5491da9511
Add closing <code> tag.
...
Earlier PR omitted </code>. Thanks to @ivantsepp for spotting.
2013-12-24 09:42:47 +00:00
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
5647a902de
Remove a useless given step
...
Since the highlighter configuration option should default to pygments,
we don't have to explicitly set it in the step testing the output with
pygments.
2013-12-23 13:03:29 +01:00
3ca2cb0119
Fix various typos and improve the doc
2013-12-23 13:03:29 +01:00
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
42aef79ab3
Update history to reflect merge of #1864
2013-12-22 22:15:09 -05:00
3d09b144f9
Merge pull request #1864 from pootsbook/patch-1
2013-12-22 19:14:35 -08:00
9d7c524530
fix file sorting test
2013-12-22 19:33:00 -05:00
Anatol Broder
Parker Moore
Ivan Tse
maul.esel
Jordon Bedwell
Garen Torikian
Robin Dupret
Philip Poots
Colin Dean
Aidan Feldman