dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,946 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

2946 Commits

Author SHA1 Message Date
Parker Moore c437d8ec38 Merge pull request #1896 from georgeanderson/master 2013-12-31 18:49:25 -08:00
Parker Moore b0ca19c67b Update history to reflect merge of #1897 2013-12-31 18:48:46 -08:00
Parker Moore 60dec88882 Merge pull request #1897 from nschonni/patch-1 2013-12-31 18:48:22 -08:00
Nick Schonning 10235aeb66 Fix Tom Preston-Werner blog source link 2013-12-31 14:03:46 -05:00
George Anderson cb80a849e4 Added paginate default to nil 
I found this missing property in the default configuration description.
 2013-12-31 14:41:06 -02:00
Matt Rogers 012387396a Merge pull request #1859 from robin850/rouge 2013-12-30 22:45:07 -06:00
Matt Rogers 47e4e81053 Update history to reflect merge of #1849 2013-12-30 22:32:21 -06:00
Matt Rogers a2fd8ba7c3 Merge pull request #1849 from afeld/sort-attributes 2013-12-30 20:31:45 -08:00
Parker Moore 7c276c6f64 Update history to reflect merge of #1894 2013-12-30 16:35:48 -08:00
Parker Moore a8a7f032ef Merge pull request #1894 from CHH/patch-1 2013-12-30 16:34:53 -08:00
Christoph Hochstrasser dd919751ac Update kramdown to 1.3 2013-12-30 22:14:41 +01:00
Parker Moore ac9bca80c8 Update history to reflect merge of #1893 2013-12-30 11:07:50 -08:00
Parker Moore a50a858c86 Merge pull request #1893 from rrgayhart/testing-additions 2013-12-30 11:03:17 -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 3744e70128 Raise restriction of safe_yaml to ~>1.0 
Amends #1886
 2013-12-28 13:47:35 -05:00
Parker Moore 194109d677 Update history to reflect merge of #1886 2013-12-28 13:46:40 -05:00
Parker Moore 3e4d47c21d Merge pull request #1886 from ivantsepp/1845_bump_safe_yaml_version 2013-12-28 10:45:57 -08:00
Ivan Tse 9d5683dc71 Bump safe_yaml version to include the fix for dtao/safe_yaml#35 2013-12-28 02:42:48 -05:00
Parker Moore da8571beec Update history to reflect merge of #1879 2013-12-26 15:23:28 -05:00
Parker Moore c53e8dbd6c Merge pull request #1879 from jekyll/update-mercenary 2013-12-26 12:23:00 -08:00
Parker Moore d2314d360a Bump mercenary to ~> 0.2.0 2013-12-26 14:34:28 -05:00
Parker Moore 7093d3aa82 Update history to reflect merge of #1877 2013-12-26 02:02:42 -05:00
Parker Moore 5f2e8b8ae4 Merge pull request #1877 from jekyll/maul-esel-consistent-opts 2013-12-25 23:02:13 -08:00
maul.esel 0e444b7843 make options consistent across commands 2013-12-26 02:00:26 -05:00
Parker Moore a2853456b6 Update history to reflect merge of #1825 2013-12-26 01:33:17 -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 46e47e6713 Update history to reflect merge of #1831 2013-12-26 01:14:48 -05: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 92c3d6d3fd Update history to reflect merge of #1841 2013-12-26 01:12:40 -05: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 a60852df19 Merge pull request #1853 from jekyll/update-history-with-v1.4.x 2013-12-25 22:07:32 -08:00
Parker Moore fbf2b5734e Update history to reflect merge of #1866 2013-12-26 01:07:01 -05:00
Parker Moore ebaa484294 Merge pull request #1866 from colindean/patch-2 2013-12-25 22:06:34 -08:00
Parker Moore 0ebec0b03f Update history to reflect merge of #1872 2013-12-26 01:06:02 -05:00
Parker Moore 5c4831af49 Merge pull request #1872 from jekyll/gjtorikian-steal-envygeeks-custom-markdown-processors 2013-12-25 22:05:31 -08:00
Parker Moore 58ae137945 Fix quick site bugs. 2013-12-26 01:02:13 -05:00
Parker Moore 88612bf7ce Add docs for custom markdown processors. 2013-12-26 00:52:20 -05: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 1550c60278 Update history to reflect merge of #1847 2013-12-24 14:05:54 -05:00