github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 17:28:29 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,722 Commits 60 Branches 160 Tags
d36f4dfea91b22f047355436e033aaf5ef1dd03b
Commit Graph

1722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Parker Moore
d36f4dfea9 Merge pull request #1123 from mainerror/docs_overflow_auto 
Documentation highlight boxes shouldn't show scrollbars if not necessary. Fixes #1122.
 2013-05-18 05:07:27 -07:00
Matt Rogers
70d38c70f7 Update history to reflect merge of #1115 2013-05-17 23:16:26 -05:00
Matt Rogers
7c012a9e0c Merge pull request #1115 from clang1234/master 
Add --force flag to new command
 2013-05-17 21:15:17 -07:00
Matt Rogers
786a120b51 Update history to reflect fixing of #1099 and #1119 2013-05-17 22:49:09 -05:00
Matt Rogers
6a7ed52b37 Update history to reflect merge of #1114 2013-05-17 22:46:11 -05:00
Matt Rogers
9614d516f0 Update history to reflect merge of #1121 2013-05-17 22:43:56 -05:00
Matt Rogers
2b84173eca Merge pull request #1121 from mojombo/non-zero-exit-on-liquid-exception 
Non zero exit on Liquid exception
 2013-05-17 20:41:04 -07:00
Matt Rogers
ddba4cde8b Merge pull request #1114 from mojombo/backwards-compatibilize-exclude-include 
Backwards-compatibilize 'exclude' and 'include' config tags
 2013-05-17 19:56:48 -07:00
Octavian Damiean
d9fd0fd7ad Fix for issue #1122. 2013-05-18 01:12:17 +02:00
Parker Moore
ff8cf7c868 provide access to the layout name so when shit goes down we get the name of the layout which couldn't be processed 2013-05-17 22:45:39 +02:00
Parker Moore
a95fa70d72 raise things when there's a yaml exception (non-zero exit code 2013-05-17 22:44:46 +02:00
Parker Moore
63dc563621 Add tests for exclude/include backwards-compatibility 2013-05-17 21:05:09 +02:00
Parker Moore
fa1cbb7708 Merge branch 'master' of github.com:mojombo/jekyll 
* 'master' of github.com:mojombo/jekyll:
  Update history to reflect merge of #1116
  Removed space characters in empty lines
 2013-05-17 20:44:40 +02:00
Parker Moore
3e7b0bbe47 Pygments does not need to be installed. Fixes #1099 #1119 2013-05-17 20:44:29 +02:00
Casey Lang
fafacc43ca Add ? to preserve_source_location 2013-05-16 16:15:21 -05:00
Casey Lang
00dd37d2e4 Extract check for force to improve readability 2013-05-16 16:13:13 -05:00
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