Parker Moore
5c680db758
Update history to reflect merge of #946 .
2013-04-12 15:42:09 +02:00
Parker Moore
bee8cd9d77
Merge pull request #946 from maul-esel/preserve_excerpt
...
Preserve 'excerpt` in YAML Front-Matter
2013-04-12 06:24:51 -07:00
Parker Moore
64aa31b3d3
Update history to reflect merge of #945
2013-04-12 15:20:55 +02:00
Parker Moore
17c1e23203
Merge pull request #945 from voidfiles/master
...
Accept multiple config files from command line
2013-04-12 06:19:55 -07: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
b10e06ce47
new test: ensure the correct excerpt is exposed to liquid
...
Also shorten test code a little bit.
2013-04-11 19:33:32 +02:00
Alex Kessinger
14a669530e
Fixing tests, and making it more ruby friendly
2013-04-11 10:17:59 -07: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
2792e1e427
fix indentation of test
2013-04-11 16:51:48 +02:00
maul.esel
0113fea7a1
Add tests for using custom excerpt
2013-04-11 14:26:20 +02:00
maul.esel
069e70d1b3
do not override custom excerpt set in YAML frontmatter
...
Fixes #933 .
2013-04-11 14:25:47 +02:00
Alex Kessinger
1e209c9bf3
Upgrade --config to accept an array of files
2013-04-10 11:38:49 -07:00
Alex Kessinger
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
8446d6e8ad
Update history to reflect merge of #413 .
2013-04-10 01:58:06 +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
1319b823f8
Release 1.0.0.beta4
2013-04-09 21:31:23 +02:00
Parker Moore
a715a8970b
Update history to reflect merge of #942
2013-04-09 21:25:16 +02:00
Parker Moore
b7646cc9ca
Merge pull request #942 from mojombo/pagination-paths
...
Add paginator.previous_page_path and paginator.next_page_path
2013-04-09 12:24:30 -07:00
Parker Moore
88f92729bc
Use paginate_path and don't help too much
2013-04-09 21:00:27 +02:00
Parker Moore
c9a8a1b29f
A bunch of pagination attributes will be nil if the subsequent/previous pages don't exist
2013-04-09 20:29:48 +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
102e29899f
Add some docs regarding what the paginator exposes in liquid
2013-04-09 20:11:12 +02:00
Parker Moore
c0f50f2c78
Update docs to use paginator.{next,previous}_page_path
2013-04-09 19:51:26 +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
fd82635868
Merge pull request #941 from dracula2000/refactor-features
...
Remove superfluous references to File#close
2013-04-09 03:17:29 -07:00
Brian Kim
c9b03991f8
Remove superfluous references to File#close
2013-04-08 17:08:17 -04:00
Parker Moore
1b8c955446
Merge pull request #939 from jroes/patch-1
...
Link to LICENSE
2013-04-08 06:57:02 -07:00
Jonathan Roes
6dcf3ad265
Link to LICENSE
2013-04-08 09:47:30 -04:00
Parker Moore
59040b84db
Update history to reflect merge of #938
2013-04-08 15:41:34 +02:00
Parker Moore
5f8895dc5f
Merge pull request #938 from maul-esel/restrict-cucumber
...
exclude cucumber 1.2.4
2013-04-08 06:39:50 -07:00
maul.esel
439278fc2c
exclude cucumber 1.2.4
2013-04-08 13:25:47 +02:00
Tom Preston-Werner
fbbcf78a99
Update GH Pages docs for github.io change.
2013-04-07 15:33:21 -07:00
Parker Moore
7d71650b4c
Update history to reflect merge of #935
2013-04-08 00:20:59 +02:00
Parker Moore
b667a6a1a8
Merge pull request #935 from mojombo/baseurl-normalization
...
Fix cascade problem with site.baseurl.
2013-04-07 15:19:23 -07:00
Parker Moore
dbb3dd3a1a
Move port and host configuration options to Jekyll::DEFAULTS so Commander doesn't override in serving awkwardly.
2013-04-07 23:55:04 +02:00
Parker Moore
90366941a2
Update history to reflect merge of #928
2013-04-07 22:53:56 +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
1526aa3b1d
Fix cascade problem with site.baseurl. Fixes #931 .
2013-04-07 22:47:55 +02:00
Parker Moore
5fe31bcbca
Update history to reflect merge of #934 .
2013-04-07 22:39:53 +02:00
Parker Moore
659ad36329
Merge pull request #934 from mojombo/auto-to-watch
...
Backwards-compatibility for 'auto'
2013-04-07 13:38:42 -07:00
Parker Moore
ae462afb76
Backwards-compatibility for 'auto'. Fixes #821 .
2013-04-07 22:29:30 +02:00
Parker Moore
b5d1b4e344
Update history to reflect merge of #918
2013-04-07 22:22:05 +02:00
Parker Moore
3e968ad14f
Merge pull request #918 from mojombo/awesome-docs
...
Clean up site docs to prepare for 1.0 release.
2013-04-07 13:20:03 -07:00
Parker Moore
b1c0f90d36
Update history to reflect merge of #875
2013-04-07 21:56:28 +02: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
ccf9d19aea
Update history to reflect merge of #892 .
2013-04-07 21:44:49 +02:00