Commit Graph

1267 Commits

Author SHA1 Message Date
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
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
Tom Preston-Werner e427e82785 Clarify config option docs for problem in #858. 2013-04-07 11:39:43 -07:00
Tom Preston-Werner 565e815354 Fixes for @parkr comments. 2013-04-06 23:14:03 -07:00
Daniel Driver ea753130e6 add ordinal date permalink style (/YYYY/DDD/slug.html) 2013-04-06 08:17:02 -04:00
Parker Moore 7376d66af2 Upgrade pygments.rb to 0.4.2. Fixes #927 2013-04-05 19:04:10 +02:00
Parker Moore 464ea6e90c Update history to reflect merge of #890 2013-04-05 18:48:08 +02: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 8e18df5b09 Merge pull request #921 from tombell/patch-1
Remove pygments as a dependency
2013-04-05 09:40:39 -07:00
Parker Moore 6782ac9ef5 Release 1.0.0.beta3 2013-04-04 16:15:02 +02:00
Parker Moore 28097a9ebb Updated version to 1.0.0.beta3. 2013-04-04 16:14:54 +02:00
Tom Bell 608088105c Remove pygments as a dependency
Pygments is bundled in pygments.rb it's no longer required
to be installed by the user.
2013-04-04 10:09:11 +02:00
Parker Moore d3e92183fd Update history to reflect merge of #909. 2013-04-03 23:11:40 +02: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
Matt Rogers 8316e1da4a Add a URL for Drupal 2013-04-03 14:10:24 -05:00