c0a2d0f888
Fixed syntax error
2013-04-15 00:42:13 +02:00
b249289b9d
Set the timezone for the process
2013-04-15 00:42:13 +02:00
d33f45ff05
Merge branch 'master' of github.com:mojombo/jekyll
...
* 'master' of github.com:mojombo/jekyll:
Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972
Fixes multiple config loading. Closes #973 . Rel: #945 .
2013-04-15 00:32:17 +02:00
f7310f554e
Whitespace in post.rb
2013-04-15 00:32:04 +02:00
55a964a7da
Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972
2013-04-14 23:18:47 +02:00
e531925cae
Fixes multiple config loading. Closes #973 . Rel: #945 .
2013-04-14 23:04:20 +02:00
e0335e2167
.formatted_topic has moved back to Jekyll::Logger. Update Build.watch to use it
2013-04-14 20:21:39 +02:00
398cd633b6
Merge pull request #959 from mojombo/deprecator
...
Refactor Logging and Deprecation Messaging
2013-04-14 11:05:07 -07:00
4ef107f3e8
Remove Logger methods from main Jekyll module.
2013-04-14 19:27:19 +02:00
81e44bf5f4
Merge pull request #955 from mojombo/refactor-markdown
...
Refactor Markdown Parser Logic
2013-04-13 20:25:37 -07:00
7a7990fb9a
Moved markdown converters into lib/jekyll/converters/markdown
2013-04-14 05:23:42 +02:00
c708d1d71b
Merge pull request #907 from advatar/pkpass_mime_type_support
...
Added pkpass to the list
2013-04-13 19:17:35 -07:00
ef51b0f9e4
Error message is red
2013-04-13 20:27:44 +02:00
ef9d8ddb7d
Matching tests to new colorized output
2013-04-13 20:24:45 +02:00
b99baeae27
Colorize warns as yellow
2013-04-13 19:58:41 +02:00
9b5ebb874f
Merge pull request #961 from benbalter/default-markdown-engine
...
Move template site to default markdown renderer
2013-04-13 10:26:34 -07:00
485b37e3d1
move template site to default markdown renderer
2013-04-13 12:41:03 -04:00
028e580bb8
Remove short-circuits from Site
2013-04-13 12:39:49 -04:00
e7815d873c
Add implicit defaults to DEFAULTS
2013-04-13 12:37:38 -04:00
17f97cdbab
Move manual printing to Jekyll.info and Jekyll.warn
2013-04-13 18:22:34 +02:00
c5f6e527b5
Bring Logger and Deprecator into the fold
2013-04-13 18:05:03 +02:00
bc6748f139
Add Jekyll::Deprecator
2013-04-13 18:03:38 +02:00
61465053eb
Add Jekyll::Logger
2013-04-13 18:02:16 +02:00
891ccbd656
Merge pull request #953 from mojombo/refactor-configuration
...
Refactor Jekyll Configuration
2013-04-13 07:19:03 -07:00
a971fec801
rescue block for the method and added redcarpet as option for parser
2013-04-13 02:13:50 +02:00
3bc497c1c9
Moved out conversion logic
2013-04-13 01:55:03 +02:00
63cdd21353
Move initialization of parsers to separate classes
2013-04-13 01:47:40 +02:00
968f3b0911
allow overriding page.path in YAML frontmatter
2013-04-13 00:05:49 +02:00
6881d3bfbf
Refactored Configuration#config_files
2013-04-12 23:59:37 +02:00
92db4ed89f
Merge pull request #951 from maul-esel/liquid-file-path
...
Expose file path to Liquid
2013-04-12 14:33:19 -07:00
bd8d271ce3
Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr-
2013-04-12 23:11:38 +02:00
879b08a0b0
In Configuration#config_files, cascade to the Configuration's value of 'source' before the default
2013-04-12 22:29:52 +02:00
f2f20d18f0
TomDoc Jekyll::Configuration
2013-04-12 21:38:30 +02:00
810a29c719
Rescue the entire method instead of just a `begin` block
2013-04-12 22:25:58 +03:00
e2967c96cd
Jekyll.configuration should use the new Jekyll::Configuration class
2013-04-12 21:20:30 +02:00
64f224933b
Add Jekyll::Configuration
2013-04-12 21:20:14 +02:00
04fd68a232
Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS
2013-04-12 21:19:20 +02:00
0884a52fea
Add TomDoc for Jekyll::Command.process_site
2013-04-12 20:01:25 +02:00
5f54507204
Remove code duplication
2013-04-12 19:35:46 +02:00
dc4d7c0bf4
fix path for posts: must include "_posts"
2013-04-12 18:17:57 +02:00
d64fd1e8fe
expose file path relative to source dir to liquid
...
Fixes #633 .
2013-04-12 17:37:16 +02:00
bee8cd9d77
Merge pull request #946 from maul-esel/preserve_excerpt
...
Preserve 'excerpt` in YAML Front-Matter
2013-04-12 06:24:51 -07:00
2b238786a2
one more indentation fix
2013-04-12 12:05:07 +02:00
bcda51f97b
do not allow markdown etc. in excerpt
...
Adjust the tests accordingly. Also
add a message for one of the tests.
2013-04-11 21:02:08 +02:00
14a669530e
Fixing tests, and making it more ruby friendly
2013-04-11 10:17:59 -07:00
951ee09a75
remove useless attr_reader for excerpt (is a method now)
2013-04-11 19:05:28 +02:00
654d598fcf
rework excerpt to be an accessor method
...
Instead of setting self.excerpt, make it a method
that returns either the custom excerpt or the pre-
viously extracted excerpt.
2013-04-11 17:13:15 +02:00
069e70d1b3
do not override custom excerpt set in YAML frontmatter
...
Fixes #933 .
2013-04-11 14:25:47 +02:00
1e209c9bf3
Upgrade --config to accept an array of files
2013-04-10 11:38:49 -07:00
df1efeff25
Accept multiple config files from command line
...
Parse config as if it can contain multiple references to config files.
This allows you to pass in multiple config files from the command line
Helps with issues #514 and #703
2013-04-10 10:19:48 -07:00
Parker Moore
Benjamin J. Balter
Brian Kim
maul.esel
Alex Kessinger