Commit Graph

3111 Commits

Author SHA1 Message Date
Matt Rogers 249642733b Merge pull request #1718 from thomasdao/master
Add docs for post_url when posts are in subdirectory
2013-11-22 18:31:09 -08:00
maul.esel c5533e9016 restrict rescue-clause in IncludeTag#render
As it previously enclosed the whole method, it also
wrapped file validation errors, which is not meant to be.

Fixes #1745.
2013-11-22 06:58:52 +01:00
maul.esel 3888a24068 output including file for include tag error 2013-11-21 22:03:39 +01:00
Parker Moore ed7fb46b96 Update history to reflect merge of #1741 2013-11-21 15:57:03 -05:00
Parker Moore 4fb437cfc6 Merge pull request #1741 from andrewhavens/patch-1
Update link to example Rakefile to point to specific commit.
2013-11-21 12:54:08 -08:00
andrewhavens 8944cdf544 Update link to example Rakefile to point to specific commit.
The link was pointing to the latest version of the file which had been changed and no longer provided the intended example.
2013-11-20 21:45:05 -08:00
Parker Moore 4786cfcb5e If no args are given, then list possible importers. 2013-11-20 22:51:47 -05:00
Parker Moore 35ef90ac66 Check if JekyllImport is defined using Object#const_defined? 2013-11-20 22:51:47 -05:00
Parker Moore b923df0c01 Let jekyll-import specify subcommands and their options for each importer.
@mojombo, this look better?
2013-11-20 22:51:47 -05:00
Parker Moore b61534d260 Switch from commander to mercenary in gemspec 2013-11-20 22:51:24 -05:00
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
Greg Karékinian 49d5c3457c Remove extra trailing whitespace 2013-11-20 00:50:56 +01: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
David Silva Smith cbdadc83a1 Add block of code which should be added to Gemfile for Windows listen compatibility.
Closes https://github.com/mojombo/jekyll/pull/1720
2013-11-18 15:20:44 -05:00
Parker Moore 752a862c67 Add note about auto-regeneration 2013-11-18 15:17:50 -05:00
Aigars Dzerviniks e974370cf1 Add additional information about encoding issues on Windows 2013-11-18 15:12:21 -05:00
Parker Moore 12fcdd9bfa Some beginning collection for Windows users.
Leaving the office so it's a bit unkempt.
2013-11-18 15:12:21 -05:00
Parker Moore 435d0bc4ab Empty file for windows docs. 2013-11-18 15:12:21 -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
thomasdao 386ea77e28 For issue #1714: Add documentation for post_url when posts are in subdirectory 2013-11-12 13:29:38 +08:00
Anatol Broder 4abd93567f Example FTW 2013-11-11 18:52:37 +01:00
Anatol Broder 29ef18828a Revert stupid whitespace 2013-11-11 18:43:08 +01:00
Anatol Broder 9291ca7492 Revert hint 2013-11-11 18:43:08 +01:00
Anatol Broder 839f231027 Replace yoursite.com by example.com 2013-11-11 18:43:08 +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