Parker Moore
18fb1bafa0
Update history to reflect merge of #3320 [ci skip]
2015-01-17 15:47:18 -08:00
Parker Moore
cf2f439db1
Merge pull request #3320 from jekyll/mcallan83-test_global_post_permalinks_with_template_variables
2015-01-17 15:47:03 -08:00
Parker Moore
87500addd5
Move the test & fix it.
2015-01-17 15:46:35 -08:00
Mike Callan
5868ba1691
new test to prove permalinks in global config do not respect template variables
2015-01-17 15:28:52 -08:00
Parker Moore
3fe80929ad
We have 47 posts now in the tests.
2015-01-17 15:28:03 -08:00
Parker Moore
57b43e2229
Update history to reflect merge of #3134 [ci skip]
2015-01-17 15:25:17 -08:00
Parker Moore
b2099ac763
Merge branch 'davidized-collection_yaml_dots'
...
* davidized-collection_yaml_dots:
Move YAML Front Matter regexp into a constant.
Add support for collections documents to have YAML front matter ending in dots.
Conflicts:
test/test_collections.rb
2015-01-17 15:24:33 -08:00
Parker Moore
c7d92c4e6d
Move YAML Front Matter regexp into a constant.
2015-01-17 15:23:33 -08:00
Parker Moore
7f44500b4b
Update history to reflect merge of #2774 [ci skip]
2015-01-17 15:17:26 -08:00
Parker Moore
6d9b4c2aba
Merge pull request #2774 from dziemian007/formatter_variables_by_relative_path
2015-01-17 15:16:50 -08:00
Parker Moore
1715956baa
Update history to reflect merge of #3014 [ci skip]
2015-01-17 15:13:46 -08:00
Parker Moore
a312115a5a
Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest
2015-01-17 15:13:17 -08:00
Parker Moore
3d69582d36
Update history to reflect merge of #3274 [ci skip]
2015-01-17 15:01:58 -08:00
Parker Moore
84cfc1ceff
Merge branch 'majioa-devel'
...
* majioa-devel:
Ensure Post#excerpt_separator always returns a string.
get procedure for default excerpt separator for both cases site and page was moved to the post's specific method :excerpt_separator.
Added per post excerpt_separator functionality, so you are able to specify :excerpt_separator (as well as just :excerpt) key direct inside the post YAML, to make an excerpt based on the value in the post. Tests were also added.
2015-01-17 15:01:20 -08:00
Parker Moore
153db8a230
Update site history. [ci skip]
2015-01-17 15:01:08 -08:00
Parker Moore
18f3d76603
Ensure Post#excerpt_separator always returns a string.
2015-01-17 14:59:44 -08:00
Parker Moore
8692822631
Update history to reflect merge of #3314 [ci skip]
2015-01-17 14:56:59 -08:00
Parker Moore
07ccbd9fac
Merge pull request #3314 from yoshyosh/master
2015-01-17 14:56:41 -08:00
Parker Moore
1fc3887d4f
Update history to reflect merge of #2571 [ci skip]
2015-01-17 14:56:13 -08:00
Parker Moore
ba2e1390ad
Merge pull request #2571 from yous/patch-mixed-case-category
2015-01-17 14:55:30 -08:00
Joseph Anderson
a1ea8b9798
Added versioning comment to configuration file
...
# previously `post` in Jekyll 2.2.
2015-01-16 15:58:21 -08:00
Parker Moore
f5fbf4ffd1
Update history to reflect merge of #3312 [ci skip]
2015-01-15 13:40:12 -08:00
Parker Moore
02aa2a1c33
Merge pull request #3312 from omegahm/fix-weird-spacing
2015-01-15 13:39:50 -08:00
Mads Ohm Larsen
60da4ef010
Fix weird spacing
2015-01-15 22:04:00 +01:00
Parker Moore
b1fd7377fd
Update history to reflect merge of #3306 [ci skip]
2015-01-14 15:07:09 -08:00
Parker Moore
5d6fe236b2
Merge pull request #3306 from adamzr/patch-1
2015-01-14 15:06:36 -08:00
Adam Richeimer
3cb0f4f590
Formatting fixes
...
- Add command to list of types of plugins
- Made "command" plural to be consistent with other types
- Made the types into links within the page
2015-01-14 11:20:03 -08:00
Jordon Bedwell
2547df81a1
Allow test to be aliased as spec.
2015-01-14 06:58:08 -06:00
Jordon Bedwell
8e7d40ed90
Seriously, why was vendor/ not in the .gitignore?
2015-01-14 05:59:12 -06:00
Jordon Bedwell
99ae1023b4
Fix bad tabbing.
2015-01-14 05:45:49 -06:00
Matt Rogers
59e1e2dd84
Update history to reflect merge of #3220 [ci skip]
2015-01-13 19:02:45 -06:00
Matt Rogers
ce78ea7818
Merge pull request #3220 from inukshuk/patch-1
2015-01-13 19:02:41 -06:00
Parker Moore
b2e114ed5b
Update history to reflect merge of #3292 [ci skip]
2015-01-13 13:14:25 -08:00
Parker Moore
06b6e86d52
Merge pull request #3292 from flyinprogrammer/eliminate_section_metadata
2015-01-13 13:13:43 -08:00
Parker Moore
5b50687e22
Update history to reflect merge of #3299 [ci skip]
2015-01-13 12:01:11 -08:00
Parker Moore
763118a381
Merge pull request #3299 from ryanburnette/fix_date
2015-01-13 12:00:33 -08:00
Ryan Burnette
80465efff7
Require date in filters.rb
2015-01-13 13:51:47 -05:00
Ryan Burnette
588bba39ad
Add test for Date object in filters.rb
2015-01-13 13:51:36 -05:00
Ryan Burnette
936c737a32
Address #3298
2015-01-13 02:21:28 -05:00
Alan Scherger
b31d8a1ecd
more concise doc array creation
2015-01-12 22:09:06 -08:00
Parker Moore
e13c800b3a
Update history to reflect merge of #3295 [ci skip]
2015-01-12 18:23:42 -08:00
Parker Moore
e724622a92
Merge pull request #3295 from jaybe-jekyll/patch-1
2015-01-12 18:23:11 -08:00
jaybe@jekyll
e378b2efd3
Update usage.md
...
Correction; clarity.
2015-01-12 18:21:00 -06:00
jaybe@jekyll
12cbfa8cf4
Update usage.md
...
Clarity.
2015-01-12 18:20:17 -06:00
Parker Moore
aedff733e0
Update history to reflect merge of #3296 [ci skip]
2015-01-12 15:08:15 -08:00
Parker Moore
fa7d4cde67
Merge pull request #3296 from jaybe-jekyll/patch-2
2015-01-12 15:08:03 -08:00
jaybe@jekyll
7be49c99c1
Update configuration.md
...
Sync Destination folder cleansing language with Usage docs page (i.e. adding `keep_files` directive).
2015-01-12 16:52:13 -06:00
jaybe@jekyll
d2b33144a7
Update usage.md
...
Sync Destination folder cleansing language with Configuration docs page (i.e. adding `keep_files` directive)
2015-01-12 16:51:15 -06:00
Sylvester Keil
60921132c6
Preserve original mtime when copying static files
2015-01-12 13:00:35 +01:00
Parker Moore
e7dcc2424a
Don't copy the .sass-cache to the gh-pages dir.
2015-01-12 00:37:33 -08:00
