dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,677 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

1677 Commits

Author SHA1 Message Date
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
Parker Moore d9e056bd60 Update history to reflect merge of #1084 2013-05-12 11:51:52 +02:00
Parker Moore 9140aad429 Merge pull request #1084 from maul-esel/deprecate-old-config 
Deprecate old config 'server_port'
 2013-05-12 02:50:20 -07:00
Parker Moore 665e8d15f7 Turn off relative permalinks on Jekyll docs. 2013-05-12 01:43:36 +02:00
Parker Moore 1d1d3727ce Merge branch 'master' into relative-permalinks 
* master:
  Update history to reflect merge of #1079
  Update gemspec for new page-based docs.
  remove docs on installing pygments
 2013-05-12 01:21:55 +02:00
Parker Moore c59cfcfd2e Not automatically deprecated. 2013-05-12 01:19:04 +02:00
Parker Moore d9f0dce67d make sure relative_permalinks is set to TRUE 2013-05-12 01:16:52 +02:00
Parker Moore 2e1316ec8b Ensure the page is in a subdir. That's the only time it's eff'd. 2013-05-12 01:08:33 +02:00
Parker Moore 6167747440 Say happy things when everything is cool 2013-05-12 01:07:58 +02:00
maul.esel 1b80fc8cc8 always be polite to the user :) 2013-05-11 20:03:55 +02:00
maul.esel a8788f4a0a copy over deprecated config option to new one 2013-05-11 19:57:11 +02:00
maul.esel c44d4248ac warn on use of deprecated "server_port" option 2013-05-11 19:54:06 +02:00
Parker Moore 0e82b4eb2f Use site config to determine whether permalinks should be relative. 2013-05-11 18:26:20 +02:00
Parker Moore 161244fd78 Add better language and link to Upgrading page in docs for relative permalinks deprecation msg 2013-05-11 18:06:33 +02:00
maul.esel eda11aa534 ensure number category is NOT included as fixnum 2013-05-11 18:03:51 +02:00
Parker Moore 1f23bc4dc0 Add support for relative permalinks 2013-05-11 18:03:03 +02:00
Parker Moore 19bc54bb07 Add doctor command 2013-05-11 18:02:53 +02:00
Parker Moore 6294c4a204 Better-formatted output with relation to 'Generating... done.' 2013-05-11 17:56:42 +02:00
Parker Moore b355ef6469 Add jekyll doctor command 2013-05-11 17:49:20 +02:00
Parker Moore e22b1bb74a Add deprecation support for pages in subfolders with relative permalinks. 2013-05-11 17:40:00 +02:00
Parker Moore 470a187395 Update history to reflect merge of #1079 2013-05-11 17:10:50 +02:00
Parker Moore 3b50f4116a Merge pull request #1079 from maul-esel/docs-remove-pygments 
Remove docs on installing pygments
 2013-05-11 08:09:53 -07:00
Parker Moore d869f99345 Update gemspec for new page-based docs. 2013-05-11 17:08:46 +02:00
maul.esel ef06f19a9e remove docs on installing pygments 
This is no longer needed as stated by @parkr in #1021,
as jekyll now comes bundled with pygments.rb.

Fixes #1021.
 2013-05-11 16:52:39 +02:00
Parker Moore d675ef6662 Fixed some things on the site. 2013-05-10 23:28:42 +02:00