Parker Moore
ba64a9fe30
Fail if destination directory for jekyll new exists and is not empty. Fixes #981 .
2013-04-16 18:24:10 +02:00
Parker Moore
6ed41e373c
Remove code duplication: #write in Page and Post is the same.
2013-04-16 02:55:31 +02:00
Parker Moore
82f32d5c02
Merge configuration properly. Closes #978 .
2013-04-16 00:41:10 +02:00
Parker Moore
e7546a98f6
Remove unnecessary override of #read_yaml in Page.
2013-04-15 19:24:23 +02:00
maul.esel
b7064a4bc3
remove 'post' and 'page' default layouts
2013-04-15 17:24:09 +02:00
Parker Moore
c0a2d0f888
Fixed syntax error
2013-04-15 00:42:13 +02:00
Parker Moore
b249289b9d
Set the timezone for the process
2013-04-15 00:42:13 +02:00
Parker Moore
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
Parker Moore
f7310f554e
Whitespace in post.rb
2013-04-15 00:32:04 +02:00
Parker Moore
55a964a7da
Print deprecation warnings for 'server', 'watch' and 'auto' when loaded from files. Fixes #972
2013-04-14 23:18:47 +02:00
Parker Moore
e531925cae
Fixes multiple config loading. Closes #973 . Rel: #945 .
2013-04-14 23:04:20 +02:00
Parker Moore
e0335e2167
.formatted_topic has moved back to Jekyll::Logger. Update Build.watch to use it
2013-04-14 20:21:39 +02:00
Parker Moore
398cd633b6
Merge pull request #959 from mojombo/deprecator
...
Refactor Logging and Deprecation Messaging
2013-04-14 11:05:07 -07:00
Parker Moore
4ef107f3e8
Remove Logger methods from main Jekyll module.
2013-04-14 19:27:19 +02:00
Parker Moore
81e44bf5f4
Merge pull request #955 from mojombo/refactor-markdown
...
Refactor Markdown Parser Logic
2013-04-13 20:25:37 -07:00
Parker Moore
7a7990fb9a
Moved markdown converters into lib/jekyll/converters/markdown
2013-04-14 05:23:42 +02:00
Parker Moore
c708d1d71b
Merge pull request #907 from advatar/pkpass_mime_type_support
...
Added pkpass to the list
2013-04-13 19:17:35 -07:00
Parker Moore
ef51b0f9e4
Error message is red
2013-04-13 20:27:44 +02:00
Parker Moore
ef9d8ddb7d
Matching tests to new colorized output
2013-04-13 20:24:45 +02:00
Parker Moore
b99baeae27
Colorize warns as yellow
2013-04-13 19:58:41 +02:00
Brian Kim
028e580bb8
Remove short-circuits from Site
2013-04-13 12:39:49 -04:00
Brian Kim
e7815d873c
Add implicit defaults to DEFAULTS
2013-04-13 12:37:38 -04:00
Parker Moore
17f97cdbab
Move manual printing to Jekyll.info and Jekyll.warn
2013-04-13 18:22:34 +02:00
Parker Moore
bc6748f139
Add Jekyll::Deprecator
2013-04-13 18:03:38 +02:00
Parker Moore
61465053eb
Add Jekyll::Logger
2013-04-13 18:02:16 +02:00
Parker Moore
891ccbd656
Merge pull request #953 from mojombo/refactor-configuration
...
Refactor Jekyll Configuration
2013-04-13 07:19:03 -07:00
Parker Moore
a971fec801
rescue block for the method and added redcarpet as option for parser
2013-04-13 02:13:50 +02:00
Parker Moore
3bc497c1c9
Moved out conversion logic
2013-04-13 01:55:03 +02:00
Parker Moore
63cdd21353
Move initialization of parsers to separate classes
2013-04-13 01:47:40 +02:00
maul.esel
968f3b0911
allow overriding page.path in YAML frontmatter
2013-04-13 00:05:49 +02:00
Parker Moore
6881d3bfbf
Refactored Configuration#config_files
2013-04-12 23:59:37 +02:00
Parker Moore
92db4ed89f
Merge pull request #951 from maul-esel/liquid-file-path
...
Expose file path to Liquid
2013-04-12 14:33:19 -07:00
Parker Moore
bd8d271ce3
Moving the backwards-compatibilizing to Configuration#read_config_files. @mattr-
2013-04-12 23:11:38 +02:00
Parker Moore
879b08a0b0
In Configuration#config_files, cascade to the Configuration's value of 'source' before the default
2013-04-12 22:29:52 +02:00
Parker Moore
f2f20d18f0
TomDoc Jekyll::Configuration
2013-04-12 21:38:30 +02:00
Parker Moore
810a29c719
Rescue the entire method instead of just a `begin` block
2013-04-12 22:25:58 +03:00
Parker Moore
64f224933b
Add Jekyll::Configuration
2013-04-12 21:20:14 +02:00
Parker Moore
04fd68a232
Move Jekyll::DEFAULTS to Jekyll::Configuration::DEFAULTS
2013-04-12 21:19:20 +02:00
Parker Moore
0884a52fea
Add TomDoc for Jekyll::Command.process_site
2013-04-12 20:01:25 +02:00
Parker Moore
5f54507204
Remove code duplication
2013-04-12 19:35:46 +02:00
maul.esel
dc4d7c0bf4
fix path for posts: must include "_posts"
2013-04-12 18:17:57 +02:00
maul.esel
d64fd1e8fe
expose file path relative to source dir to liquid
...
Fixes #633 .
2013-04-12 17:37:16 +02:00
maul.esel
2b238786a2
one more indentation fix
2013-04-12 12:05:07 +02:00
maul.esel
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
maul.esel
951ee09a75
remove useless attr_reader for excerpt (is a method now)
2013-04-11 19:05:28 +02:00
maul.esel
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
maul.esel
069e70d1b3
do not override custom excerpt set in YAML frontmatter
...
Fixes #933 .
2013-04-11 14:25:47 +02:00
Parker Moore
abb8e5039e
Merge pull request #413 from sethladd/master
...
add page variable to liquid custom tags and blocks
2013-04-09 16:54:20 -07:00
Parker Moore
88f92729bc
Use paginate_path and don't help too much
2013-04-09 21:00:27 +02:00
Parker Moore
9c296f04a9
Join the path with baseurl in Pager.paginate_url
2013-04-09 20:26:08 +02:00
Parker Moore
b9e7a31ab8
Return nil if num_page is nil
2013-04-09 20:25:43 +02:00
Parker Moore
e5bf5aa09e
Documentation for Pager.paginate_url
2013-04-09 20:25:33 +02:00
Parker Moore
b10939912f
Add paginator.previous_page_path and paginator.next_page_path
2013-04-09 19:48:41 +02:00
Parker Moore
8bf55ef8fa
Merge pull request #928 from danieldriver/ordinal_date
...
add ordinal date permalink style (/YYYY/DDD/slug.html)
2013-04-07 13:52:30 -07:00
Parker Moore
0f2c9d29ee
Merge pull request #875 from mojombo/posts-cant-be-dirs
...
Directories with valid post names should be filtered out
2013-04-07 12:54:42 -07:00
Parker Moore
7b36d26240
Merge pull request #892 from rafaelrosafu/master
...
Added date_to_rfc822 used on RSS feeds
2013-04-07 12:43:50 -07:00
Daniel Driver
ea753130e6
add ordinal date permalink style (/YYYY/DDD/slug.html)
2013-04-06 08:17:02 -04:00
Parker Moore
483a0b68b6
Merge pull request #890 from zachgersh/abbreviated_month
...
Added abbreviated month + test.
2013-04-05 09:44:50 -07:00
Parker Moore
cf461ea1a5
Merge pull request #909 from x3ro/symlinked-static-files
...
Fix symlinked static files not being correctly built in unsafe mode
2013-04-03 14:10:35 -07:00
Alexander Ekdahl
8810dc6479
Preloads directory_watcher glob
2013-04-02 17:46:07 +02:00
Lucas Jenss
2c7325223f
Fix symlinked assets not being included, even in unsafe mode
2013-03-31 20:49:43 +02:00
Johan Sellström
8d1b6720c3
Added pkpass to the list
2013-03-31 18:22:41 +03:00
zachgersh
e931414b77
Changed to short_month and re-ran tests.
2013-03-27 08:40:58 -07:00
Rafael Rosa Fu
186b68adb0
Added filter date_to_rfc822
...
According to the W3C RSS Feed Validator, feeds must format dates as described
on RFC-822 to be valid. Refer to their site to get more info:
http://feedvalidator.org/docs/error/InvalidRFC2822Date.html
I also added a couple of missing unit tests to the other date filters
2013-03-27 02:21:48 -04:00
zachgersh
6657f2add9
Added abbreviated month + test.
2013-03-26 23:06:34 -07:00
Matt Rogers
fa39a97bc6
Remove unused code
2013-03-25 21:22:42 -05:00
Aleksey V. Zapparov
196e26b580
Flatten tags and categories lists. Fixes #741 .
2013-03-19 23:16:53 +01:00
Parker Moore
a72cdc9293
Auto-regeneration fails loudly. Fixes #470 .
2013-03-19 22:31:37 +01:00
Parker Moore
6f6ad001d2
Ignore entries if they are directories.
2013-03-19 21:59:06 +01:00
Parker Moore
73ca35ee81
Ensure all categories are downcase. Fix for #842 .
2013-03-17 23:43:37 +01:00
Parker Moore
9d814a4eb7
Add method String#force_encoding to 1.8.7
2013-03-17 23:35:46 +01:00
Dave Wasmer
f7f64576e5
Force encoding of the rdiscount TOC to UTF8 to avoid conversion errors
2013-03-17 22:28:52 +01:00
Parker Moore
a054ce2788
Merge pull request #861 from danielgrieve/gist-tag
...
display single files from gist
2013-03-17 13:33:10 -07:00
Parker Moore
7ba5a27a74
Merge pull request #871 from mojombo/gh-pages-mime-types
...
Use GH Pages MIME types.
2013-03-17 13:22:51 -07:00
Parker Moore
4400e89898
Expect a 'baseurl' to be passed in to Site
2013-03-17 21:18:45 +01:00
Tom Preston-Werner
8c6c33a6c8
Use GH Pages MIME types.
2013-03-17 13:14:35 -07:00
Parker Moore
ebcf3eb385
Merge pull request #869 from mojombo/baseurl-in-liquid
...
Expose site.baseurl to Liquid templates.
2013-03-17 12:53:27 -07:00
Parker Moore
6c1a08ce87
Merge pull request #862 from mojombo/fix-autogen-dest-prob
...
Stop DirectoryWatcher from watching the destination directory
2013-03-17 12:48:30 -07:00
Parker Moore
d5ed4fc5d0
Add baseurl to Site attr_accessor list.
2013-03-17 20:42:11 +01:00
Parker Moore
eef13d7d43
Expose site.baseurl to Liquid templates.
2013-03-17 17:26:33 +01:00
Daniel Grieve
b9cbce5e5f
fix regex
2013-03-17 15:04:03 +00:00
Parker Moore
936ed1f849
Merge pull request #837 from ixti/feature-excerpt
...
Adds excerpt to posts
2013-03-17 07:53:41 -07:00
Parker Moore
aa7a234c18
Merge master into jekyll-new
2013-03-17 15:45:37 +01:00
Aleksey V Zapparov
66c5ef2556
Fix typos and remove some obtrusive code
2013-03-17 13:42:46 +01:00
Daniel Grieve
22d1fdab54
tie down the regex match on gist filenames
2013-03-17 11:29:42 +00:00
paco
23a01e7766
Patch for multibyte URI problem. Closes #723 .
2013-03-16 21:20:11 +01:00
Daniel Grieve
6c5d001986
replace \s with space
2013-03-16 19:20:54 +00:00
Tommy Sullivan
caa6a4ebfd
Sort instantiated subclasses in Site.
2013-03-16 15:24:34 +01:00
Matt Rogers
10ee5c8999
Remove the duplication when creating Converters and Generators
...
Encapsulate it in a method and give the method the class to walk the
subclass tree for to create new objects.
2013-03-16 15:20:11 +01:00
Parker Moore
8acb1b29bd
Using 1.8.7-compliant File.expand_path instead of >1.9 File.realpath
2013-03-16 14:24:34 +01:00
Parker Moore
1d920f52f1
Fix bug where Command.globs didn't delete the destination directory.
...
There was often a mix between absolute and relative paths and in the
previous version, the destination argument was usually an absolute
path where the glob array (from Dir['*']) was a relative path.
2013-03-16 13:57:28 +01:00
Daniel Grieve
92d9c4301b
display single files from gist
2013-03-15 22:37:14 +00:00
Daniel Grieve
4be5dfdb9a
fix copying of site template files
2013-03-13 21:27:41 +00:00
Daniel Grieve
099fcc27d6
raise ArgumentError if no args. rename sample post
2013-03-13 19:21:11 +00:00
Parker Moore
df9964c3b5
Merge pull request #838 from mattr-/dedupe-entry-generation
...
Remove code duplication during site generation
2013-03-12 11:27:56 -07:00
Parker Moore
2473bdbd7c
Merge pull request #847 from mojombo/mime_file
...
Load in Apache MIME Types
2013-03-12 11:06:26 -07:00
Jonathan Roes
7a86d901f1
Refactor Commands::New a bit and remove scaffold post once copied.
2013-03-12 00:48:22 -04:00
Parker Moore
725b127f9b
Merge pull request #536 from fotos/fix_page_dir
...
Added path in url.
2013-03-09 17:07:16 -08:00
Fotos Georgiadis
f79662719b
Fix indentation.
2013-03-09 15:07:27 +02:00
Parker Moore
524aa1f36a
Jekyll::Commands::Serve reads in mime.types file.
2013-03-08 20:12:52 +01:00