github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 01:08:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,897 Commits 60 Branches 160 Tags
1a3a607fcf164e2dc3778223b999bdc75c19a8bb
Commit Graph

1090 Commits

Author SHA1 Message Date
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
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
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
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
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
Eric Mill
afe9387578 condensing code slightly 2013-12-10 11:04:04 -05:00
Matt Rogers
ed82098162 Merge pull request #1796 from mojombo/fix-fetching-things 
Reject nil entries in Site#read_things
 2013-12-09 18:23:19 -08:00
Christoph Schiessl
695e5bbc40 move EntryFilter class from global namespace into Jekyll module 2013-12-09 23:06:27 +01:00
Parker Moore
063111737c Refactor data/[] fetching of item property. 2013-12-09 12:59:43 -05:00
Parker Moore
bf9cf5340d Reject nil entries in Site#read_things 2013-12-09 12:46:57 -05:00
Eric Mill
14418f74ae in-progress patch for maruku and fenced code blocks 2013-12-08 22:37:46 -05:00
Parker Moore
381ab4e71b Implement group_by Liquid filter & tests. 2013-12-08 01:16:48 -05:00
Parker Moore
601f89d4d1 Remove File.read_with_options patch to allow 1.9 and 1.8 to behave the same 2013-12-08 00:50:12 -05:00
Parker Moore
d130fd13dc Remove Ruby <1.9 core extensions 2013-12-08 00:47:44 -05:00
Parker Moore
b58cd5c132 Merge pull request #1657 from mojombo/safe-whitelist 
A gem-based plugin whitelist for `safe` mode
 2013-12-07 21:41:55 -08:00
Matt Rogers
350c9b3ab5 bump the version number in the code 2013-12-07 17:59:16 -06:00
Matt Rogers
362d28f11d Merge pull request #1779 from mojombo/no-duplication 
Refactor post and draft object creation
 2013-12-06 20:58:24 -08:00
Matt Rogers
9f1593299a Merge pull request #1775 from Ivoz/maruku 
Update to maruku 0.7
 2013-12-06 20:56:52 -08:00
Persa Zula
6a13f7dd57 Modifying enumerator for 1.8.7 2013-12-06 01:28:21 -05:00
Matt Rogers & Persa Zula
e69d77b4df Refactor post and draft object creation 
De-duplicate object creation between posts and drafts. Inject the name
dependency through a parameter
 2013-12-06 01:28:21 -05:00
Parker Moore
e91db82d26 I mean the argument and the local variable should be the same thing 2013-12-06 01:07:34 -05:00
Parker Moore
f0fbc8f356 Refactor conditions for allowing plugins into a new method: Site#plguin_allowed? 2013-12-06 00:26:44 -05:00
Parker Moore
249b13a98a Hm, shouldn't need that call to 'rescue' in Site#whitelist 2013-12-06 00:24:59 -05:00
Parker Moore
5c9f9a4de8 The whitelist should be an array (not a file) 
Default to `[]` if the key’s value is falsey
 2013-12-06 00:23:22 -05:00
Matt Rogers
4a2e5af52e Merge pull request #1682 from envygeeks/patch-1 
Sort plugins so people can have "load orders".
 2013-12-04 18:40:04 -08:00
Matt Rogers
052a577938 Merge pull request #1765 from mojombo/tomlify 
Add support for TOML config files
 2013-12-04 18:28:20 -08:00
Matthew Iversen
5ed9d21ec7 Remove extraneous newlines from XHTML output 2013-12-05 12:04:55 +11:00
Parker Moore
b637420373 Merge pull request #1755 from gregkare/more_trailing_whitespace 
Remove trailing whitespace
 2013-12-02 12:35:06 -08:00
David Sawyer
63122fdafc add a space between "find" and "an" 2013-12-01 19:11:16 -05:00
Parker Moore
b8bbc6e08b require the TOML gem, idiot. 2013-11-29 23:33:38 -05:00