Commit Graph

1758 Commits

Author SHA1 Message Date
Casey Lang 09eb0c5718 Merge in additional changes from mojombo/jekyll 2013-05-16 16:08:44 -05:00
Matt Rogers 4123406bd2 Update history to reflect merge of #1116 2013-05-16 15:27:50 -05:00
Matt Rogers 70672c98d9 Merge pull request #1116 from blinry/master
Removed space characters in empty lines
2013-05-16 12:47:17 -07:00
Sebastian Morr 151ffab6fe Removed space characters in empty lines 2013-05-16 20:27:27 +02:00
Casey Lang 294437fbf1 Merge latest commits from mojombo/jekyll 2013-05-15 17:36:48 -05:00
Casey Lang 2ce39bc20a Add '--force' to 'new' command. Implements #1104 2013-05-15 17:29:27 -05:00
Parker Moore 8e3ab9ea36 Backwards-compatibilize 'exclude' and 'include' config tags. Fixes #1109 2013-05-16 00:25:16 +02:00
Parker Moore d1c626f2e2 Update history to reflect merge of #1035 2013-05-15 23:59:51 +02:00
Parker Moore 13ed02fdb0 Merge pull request #1035 from tkareine/add_minibundle_to_plugin_list
Add link to jekyll-minibundle in the doc's plugins list
2013-05-15 14:59:05 -07:00
Parker Moore 784aaee40a Update gemspec with new files. 2013-05-15 23:58:32 +02:00
Tuomas Kareinen fb28c0292b Add link to jekyll-minibundle in the doc's plugins list 2013-05-15 22:00:07 +03:00
Parker Moore 98923f87b5 Update history to reflect merge of #1057 👍 2013-05-15 16:26:41 +02:00
Parker Moore ef48cbefec Merge pull request #1057 from mojombo/refactor-related-posts
Move the building of related posts into their own class
2013-05-15 07:25:53 -07:00
Parker Moore 5258e3afa3 Logger ~> Stevenson and don't inherit from Ruby Logger. #1106. 2013-05-15 15:15:00 +02:00
Parker Moore 7b22502c94 Quick patch for migration docs. 2013-05-15 13:58:08 +02:00
Parker Moore 8537c6770e Update history to reflect merge of #1107 2013-05-15 13:45:16 +02:00
Parker Moore 77ddb2765b Merge pull request #1107 from pauloppenheim/master
doc fix: migrations - wordpressdotcom command
2013-05-15 04:43:57 -07:00
Paul Oppenheim 98f8ee31e3 doc fix: migrations - wordpressdotcom command
The new paths are what just worked for me. Was frustrating figuring it out, figured I'd share.
2013-05-15 03:32:17 -07:00
Matt Rogers 98aff03595 Use Jekyll::Stevenson#formatted_topic for printing messages
Beats trying to line them up yourself. :-)
2013-05-14 22:04:34 -05:00
Matt Rogers ff600bfcd9 Merge branch 'master' into refactor-related-posts 2013-05-14 21:54:12 -05:00
Parker Moore 8877d0db66 Update history to reflect merge of #1106 2013-05-14 22:03:37 +02:00
Parker Moore e71e90cebc Merge pull request #1106 from mojombo/stevenson
Rename Jekyll::Logger ~> Jekyll::Stevenson to fix inheritance problem
2013-05-14 13:01:38 -07:00
Parker Moore 35f4f09c3e Rename Jekyll::Logger ~> Jekyll::Stevenson to fix inheritance problem
Problem described here: ca888cad76
2013-05-14 21:07:23 +02:00
Parker Moore 7186a557f6 Update history to reflect merge of #1068. 2013-05-14 21:01:06 +02:00
Parker Moore ed80f6b017 Merge branch 'add_contentblocks' of git://github.com/rustygeldmacher/jekyll into rustygeldmacher-add_contentblocks
* 'add_contentblocks' of git://github.com/rustygeldmacher/jekyll:
  Added jekyll-contentblocks to the plugins list
2013-05-14 21:00:00 +02:00
Parker Moore 7611b936b1 The --watch has two dashes. Prevent MaRuKu blending them into an emdash. 2013-05-14 20:58:28 +02:00
Parker Moore 8793048add The CLI command isn't capitalized :) 2013-05-14 20:29:14 +02:00
Parker Moore 3f21f87ccf Make MaRuKu bend to our will. 2013-05-14 20:27:17 +02:00
Parker Moore 03887262a3 Update history to reflect merge of #1089. 2013-05-14 19:58:48 +02:00
Parker Moore a85f7c1cf2 Merge pull request #1089 from zachgersh/cobyism_style
Adds margin to code highlights. Tweaks colorscheme of notes.
2013-05-14 10:57:18 -07:00
zachgersh fed4f516bf Simplified based on cobyism suggestion. 2013-05-14 08:25:54 -07:00
Parker Moore 1ce36fb1ff Update history to reflect merge of #1101. 2013-05-14 12:40:04 +02:00
Parker Moore 93a041d871 Merge pull request #1101 from sankage/upgrade-docs
relative permalinks in upgrade docs are reversed
2013-05-14 03:37:31 -07:00
zachgersh f2d7cdea89 Fixed shading on notes, made it less apparent. 2013-05-13 23:31:05 -07:00
David Briggs 47e1a449e1 fix upgrade docs 2013-05-14 00:12:48 -04:00
Parker Moore d99b4324e7 When talking about post excerpts, be singular about it. 2013-05-12 23:19:38 +02:00
Parker Moore 6aaf631fcf Fix some language problems, props @maul-esel 2013-05-12 23:18:25 +02:00
Parker Moore f1c5579c5b Add docs for post excerpt #1072 2013-05-12 17:54:15 +02:00
Parker Moore 483ecec2b4 Update history to reflect addition of docs for gist tag #1072 2013-05-12 16:20:46 +02:00
Parker Moore 208becee86 Add docs for gist tag. 2013-05-12 16:20:05 +02:00
Parker Moore f56090be3f Updated language for relative_permalinks 2013-05-12 16:05:18 +02:00
Parker Moore 8051df0f4c Release 1.0.2 2013-05-12 15:26:45 +02:00
Parker Moore 56e7f7688e Add note in history about documentation for #1081 2013-05-12 14:08:11 +02:00
Parker Moore 61faef46cc Add documentation about relative_permalinks. #1081 2013-05-12 14:07:30 +02:00
Parker Moore 7671b45a92 Update history to reflect merge of #1066. 2013-05-12 12:12:49 +02:00
Parker Moore 179a746091 Merge pull request #1066 from Rowno/data-language
Add a `data-lang` attribute to code blocks
2013-05-12 03:11:11 -07:00
Parker Moore 427bb6aec7 Update history to reflect merge of #1081. 2013-05-12 11:57:56 +02:00
Parker Moore 28b9e351c4 Merge pull request #1081 from mojombo/relative-permalinks
Backwards-compatibilize relative permalinks
2013-05-12 02:55:49 -07:00
Parker Moore 91317b29b3 Update history to reflect merge of #1078 2013-05-12 11:53:37 +02:00
Parker Moore f9502dc9f5 Merge pull request #1078 from maul-esel/fix-num-category
Fix number category
2013-05-12 02:52:39 -07:00