maul.esel
20ea0c8d56
Merge branch 'master' into frontmatter-defaults
2013-10-14 19:44:06 +02:00
maul.esel
699eeba9f0
fix frontmatter defaults for custom paths
...
The Page#path or Post#path can be overriden by by a frontmatter
setting. This causes path-based frontmatter default detection to
fail. Add test to demonstrate this and fix it.
2013-10-14 19:16:53 +02:00
maul.esel
67a451ea84
fix slash handling for paths
2013-10-14 18:43:12 +02:00
Matt Rogers
0761769dda
Merge pull request #1615 from benbalter/downcase-lexers
...
Downcase lexers before passing to Pygments
2013-10-10 18:48:00 -07:00
Juan Ignacio Donoso
87ef39aeb0
Add support for use of folders inside _layout path, closes #1622
2013-10-08 14:19:12 -03:00
Ben Balter
844cc615e4
actually downcase lexer
2013-10-06 15:55:16 -04:00
Brice
9ff245dbdb
clean up comments to be more concise/uniform
2013-10-05 13:20:30 -04:00
Ben Balter
d5f137bc86
downcase lexers before passing to Pygments
2013-10-05 11:26:26 -04:00
maul.esel
b00849544b
fix error with variable as file name
2013-10-04 19:12:29 +02:00
Matt Rogers
fef96d95e1
Merge pull request #1495 from maul-esel/variable-include
...
Variable {% include %}
2013-10-04 05:42:27 -07:00
maul.esel
76ada8c672
output correct path in case of liquid error in layout
...
As with includes, an error in a layout was reported on the
page that used the layout. Fix this by passing on the path
of the layout that is rendered.
2013-10-04 00:07:50 +02:00
maul.esel
809ab5e355
Move catching of liquid errors in include tags
...
The previous code only caught render-time errors. This change
makes it catch parse-time errors as well, such as unknown tags.
2013-10-03 23:56:58 +02:00
Matt Rogers
92750c3cfd
Add parenthesis to the call for super
2013-10-02 21:51:32 -05:00
maul.esel
7a4ea086a1
Output path in case of render error in included file
...
Fixes #1591 .
2013-10-01 23:02:50 +02:00
maul.esel
623fa14b3c
Include tag: provide path in case of render error
2013-10-01 22:54:39 +02:00
maul.esel
2138dfc0ac
Fix code to allow dots in variables
2013-10-01 22:31:11 +02:00
maul.esel
a93795bcc0
implement variable retrieval in include tag
...
Fixes #1464 .
2013-10-01 22:28:45 +02:00
Matt Rogers
9d4f9169e9
Merge pull request #1514 from maul-esel/tag-errors
...
Consistent error handling in Liquid tags
2013-09-30 20:54:42 -07:00
Matt Rogers
cb4d15561c
Merge pull request #1003 from liufengyun/data-sources
...
support data sources
2013-09-30 20:47:57 -07:00
liufengyun
760cbc7f91
Autoload yaml files under _data directory
...
The jekyll engine will autoload all yaml files(ends with .yml or .yaml)
under _data. If there's a file members.yml under the directory, then user
can access contents of the file through site.members.
2013-10-01 11:23:33 +08:00
Parker Moore
924285695c
Print server address when launching a server.
...
Related to: https://github.com/mojombo/jekyll/issues/1583
2013-09-28 19:18:36 -04:00
Parker Moore
27347596ad
Merge pull request #1449 from shigeya/config-encoding-and-yaml-opts
...
Adding "encoding" configuration (4th version)
2013-09-23 19:30:44 -07:00
Parker Moore
c78c4159c0
Merge pull request #1571 from mojombo/non-destructive-array-concat
...
Use + instead of Array#concat
2013-09-23 07:16:41 -07:00
Edward Ball
943acc4395
Remove overly specific css from site template
2013-09-23 13:23:54 +01:00
Parker Moore
a88a63da2d
Don't use destructive Array#concat for Liquid Attribute arrays
2013-09-22 18:26:34 -04:00
maul.esel
1829c2734a
'gist' tag: switch to ArgumentError exception class
...
SyntaxError is reserved for Ruby's internal use.
Adjust the tests, including the call to liquid to
make it rethrow ArgumentErrors.
2013-09-19 23:23:04 +02:00
maul.esel
9409a3d034
raise exceptions in include tag
2013-09-19 14:32:15 +02:00
maul.esel
72c3bba56a
Change error handling in 'post_url' tag: raise exception
2013-09-19 14:24:22 +02:00
maul.esel
06fb31544f
Change error handling for gist tag: raise exception
2013-09-19 14:24:22 +02:00
Shigeya Suzuki
c625ddf6cd
Invoke File.read with or without options depends on Ruby version
...
- Extract option fetch method as a separate method
- Added File.read_with_options method to use
- With performance fix
2013-09-19 12:22:50 +09:00
Shigeya Suzuki
97e052df63
Pass encoding parameter as string, not an object
2013-09-19 12:21:26 +09:00
Shigeya Suzuki
8b892ed735
read_yaml to accept optional parameter to override defaults
2013-09-19 12:21:25 +09:00
MURAOKA Taro
4cb24f4b87
consider a case of "site" is unavailable in Convertible
2013-09-19 12:21:25 +09:00
MURAOKA Taro
f4c2383d3c
write document for config.encoding
2013-09-19 12:21:25 +09:00
MURAOKA Taro
8a28d80690
add encoding for configuration
2013-09-19 12:21:25 +09:00
Matt Rogers
793eb96a77
Merge pull request #1490 from penibelst/allow-include-read-override
...
Extract include tag read file in a method
2013-09-18 19:34:45 -07:00
Anatol Broder
ec85c49de3
Change exception type
2013-09-17 22:11:56 +02:00
Anatol Broder
7cec996f90
Validate the entire markup as soon as possible
2013-09-17 21:41:11 +02:00
Anatol Broder
25519b38f6
Validate file name as soon as possible
2013-09-17 20:57:01 +02:00
Anatol Broder
8017548bd0
Rename variable
2013-09-17 20:46:01 +02:00
Anatol Broder
7f62e69837
Remove obvious comment
2013-09-17 20:36:33 +02:00
Anatol Broder
e5f99e2798
Remove return
2013-09-17 20:35:18 +02:00
Anatol Broder
3e2ab58d56
Fix unruby paradigm
2013-09-17 20:34:04 +02:00
Anatol Broder
a42e57f274
Rename constants
2013-09-17 20:14:41 +02:00
Matt Rogers
de49342324
Merge pull request #1556 from maul-esel/dest-match
...
Fix up matching against source and destination when the two locations are similar.
2013-09-16 18:34:22 -07:00
Matt Rogers
454e038fad
Require 'pathname'
2013-09-16 20:29:57 -05:00
Anatol Broder
3dadc94ce4
Don’t repeat yourself
2013-09-16 23:16:41 +02:00
maul.esel
299cb93147
improve path checking, now using Pathname instead of regex
2013-09-16 15:42:59 +02:00
maul.esel
bec4a07c12
Fix handling of source-dest matching being too aggressive
...
Fixes #1130 .
2013-09-16 14:41:20 +02:00
Anatol Broder
891ea8f604
People can symlink it if they want in unsafe mode
2013-09-16 08:37:07 +02:00
