Commit Graph

2686 Commits

Author SHA1 Message Date
Parker Moore 2299e996d2 Fix serve -> server alias, ensure --drafts is mapped to show_drafts 2013-11-20 22:51:24 -05:00
Parker Moore d1856b40f8 Add syntax for mercenary CLI engine by @mojombo 2013-11-20 22:51:24 -05:00
Parker Moore 063ee6fb67 Update history to reflect merge of #1734 2013-11-19 13:49:52 -05:00
Parker Moore 22ff7d00f4 Merge pull request #1734 from gregkare/travis_cache
Enable Travis' bundle caching
2013-11-19 10:48:19 -08:00
Greg Karékinian aec4286ca6 Enable Travis' bundle caching
It should speed up the builds significantly. See
http://about.travis-ci.org/docs/user/caching/#Bundler for more details.
2013-11-19 17:32:11 +01:00
Parker Moore f4918a623b Update history to reflect merge of #1732 2013-11-18 18:59:10 -05:00
Parker Moore 86e717fad4 Merge pull request #1732 from mojombo/fix-import-docs
Remove all the docs for migrations and link to http://import.jekyllrb.com
2013-11-18 15:58:21 -08:00
Parker Moore cbee41330e Remove all the docs for migrations and link to http://import.jekyllrb.com 2013-11-18 18:56:38 -05:00
Matt Rogers 315cfcd727 Update history to reflect merge of #1730 2013-11-17 23:01:28 -06:00
Matt Rogers c120b96638 Merge pull request #1730 from mojombo/pathname-to-s
Use Pathname#to_s instead of Pathname#to_path
2013-11-17 21:00:27 -08:00
Parker Moore dfffc2e72a Use Pathname#to_s instead of Pathname#to_path
Fixes #1723.
2013-11-16 13:12:59 -05:00
Matt Rogers 1d81f2553d Update history to reflect merge of #1726 2013-11-15 08:26:45 -06:00
Matt Rogers e0ef667dad Merge pull request #1726 from maul-esel/include-fix
fix variable include tag in a loop
2013-11-15 06:25:33 -08:00
maul.esel 5e0af84993 fix include tag: don't store variable value
This fixes the bug reported in #1495 (comments).
2013-11-14 20:53:59 +01:00
maul.esel 8382a8b91b add test case for variable include tag in a loop 2013-11-14 20:47:42 +01:00
Matt Rogers 6842148389 Update history to reflect merge of #1669 2013-11-10 21:45:47 -06:00
Matt Rogers 99d44d261d Merge pull request #1669 from albertogg/jekyll-import-arguments
Add table_prefix option for jekyll-importer
2013-11-10 19:44:20 -08:00
Parker Moore 861f367de7 Update history to reflect merge of #1711 2013-11-08 23:16:36 -05:00
Parker Moore 93ad50e4a9 Merge pull request #1711 from abhiyerra/org-mode-converter-link
Link to an org-mode converter for Jekyll
2013-11-08 20:15:02 -08:00
Abhi Yerra 4e38d4858c Link to an org-mode converter for Jekyll 2013-11-08 13:09:40 -08:00
Parker Moore 0a359b586d Update history to reflect merge of #1707 2013-11-08 14:34:33 -05:00
Parker Moore 7cf41bbbf9 Merge pull request #1707 from localheinz/patch-1
Fix link to previous section
2013-11-08 11:33:34 -08:00
Parker Moore 0819877701 Update history to reflect merge of #1708 2013-11-08 14:28:48 -05:00
Parker Moore 2b71caf9c3 Merge pull request #1708 from yihangho/add-emoji-plugin
Add Emoji for Jekyll to plugin list.
2013-11-08 11:27:47 -08:00
Yihang Ho eeecbdc82a Add Emoji for Jekyll to plugin list. 2013-11-08 17:36:07 +08:00
Andreas Möller 1defcad9a3 Fix link to previous section
There's no `assets` section. Linking to `pagination` instead.
2013-11-08 08:40:19 +01:00
albertogg 41b2000129 Use prefix instead of table_prefix. 2013-11-06 19:14:39 -05:00
Matt Rogers 0a0acaad37 Update history to reflect merge of #1697 2013-11-05 07:45:44 -06:00
Matt Rogers a05e8af5da Merge pull request #1697 from mojombo/entry-filter-method-object
Extract `Site#filter_entries` into a method object
2013-11-05 05:44:25 -08:00
Parker Moore a26663fb36 Update history to reflect merge of #1670 2013-11-04 23:21:40 -05:00
Parker Moore a35cb5ff53 Merge pull request #1670 from samrayner/add-asset-path-tag-to-docs
Add Asset Path Tag to plugin list in docs
2013-11-04 20:20:57 -08:00
Parker Moore 93bd11ea05 Update history to reflect merge of #1695 2013-11-04 23:16:49 -05:00
Parker Moore 898b1372aa Merge pull request #1695 from santtu/patch-1
Updated docs to match reality, where drafts are dated based on file modi...
2013-11-04 20:15:53 -08:00
Parker Moore 2b851be9bd Update history to reflect merge of #1693 2013-11-04 23:15:29 -05:00
Parker Moore ba30f012d6 Merge pull request #1693 from shigeya/website-update-shigeya-plugins
Plugin description updates for Monthly/Category archive generator
2013-11-04 20:14:37 -08:00
Matt Rogers 6791f9fc12 Use the new `EntryFilter` class in `Site` 2013-11-04 21:35:53 -06:00
Matt Rogers 63713799cd Extract Site#filter_entries into its own class 2013-11-04 21:35:13 -06:00
Parker Moore 5d672782fb Update jekyllrb.com site history. 2013-11-04 21:07:51 -05:00
Matt Rogers 12989f9a4e Release 1.3.0 2013-11-04 19:59:57 -06:00
Matt Rogers db0b0f0160 Release 1.3.0 2013-11-04 19:59:40 -06:00
Parker Moore dd6cb7a0cf Merge pull request #1694 from mojombo/release-1.3.0
Release 1.3.0
2013-11-04 11:51:21 -08:00
Parker Moore 2087fb87b2 Fix link to /docs/datafiles/ in 1.3.0 release post. 2013-11-04 14:43:27 -05:00
Parker Moore b9817ab47b Fix release date of v1.3.0 in History file 2013-11-04 14:40:53 -05:00
Parker Moore a49a0ec2ac Minor fixes to v1.3.0 release post. 2013-11-04 14:39:56 -05:00
Santeri Paavolainen b5437a49fb Updated docs to match reality, where drafts are dated based on file modification time
See 8e7b6bf5ff/lib/jekyll/draft.rb (L28) -- source uses `File.mtime` on the draft file, not `Time.now` as the doc says.
2013-11-04 19:10:25 +02:00
Matt Rogers 65653fed84 Bump version to 1.3.0 2013-11-03 21:48:34 -06:00
Shigeya Suzuki 8987db896e Plugin description updates for Monthly/Category archive generator 2013-11-04 12:46:18 +09:00
Matt Rogers cc0c82f9d2 Prep for the 1.3.0 release 2013-11-03 21:46:02 -06:00
Matt Rogers 3eed1cfed1 Update history to reflect merge of #1691 2013-11-03 09:55:54 -06:00
Matt Rogers 340bf0985a Merge pull request #1691 from katydecorah/master
updated end to endfor
2013-11-03 07:51:07 -08:00