Commit Graph

6257 Commits

Author SHA1 Message Date
Parker Moore 2e7c471c70 Add Document#method_missing and Collection#method_missing
Proxies calls to either #data or #docs, respectively. Deprecation warning is printed.
2015-10-26 13:37:04 -07:00
Jordon Bedwell 74734d46f8 Update JRuby on Travis-CI. 2015-10-26 13:55:00 -05:00
Parker Moore 7fbe61fc77 Update history to reflect merge of #4053
[ci skip]
2015-10-26 09:57:07 -07:00
Parker Moore e9e4a5d21e Merge pull request #4053 from sparanoid/patch-1
Merge pull request 4053
2015-10-26 09:56:03 -07:00
Parker Moore 260ad9a3fb Update history to reflect merge of #4055
[ci skip]
2015-10-26 09:53:43 -07:00
Parker Moore e58d0ae0ef Merge pull request #4055 from jekyll/beefer-collections
Merge pull request 4055
2015-10-26 09:53:13 -07:00
Parker Moore b89f943bf2 collections: posts as collection 2015-10-26 00:29:14 -07:00
Tunghsiao Liu 2f5303dd67 Apply rouge highlighter background to child node 2015-10-26 15:17:04 +08:00
Tunghsiao Liu 58365ae898 Add missing highlighting CSS class for Rouge 2015-10-25 19:40:40 +08:00
Parker Moore 7330b499f1 Update history to reflect merge of #4050
[ci skip]
2015-10-22 11:22:38 -07:00
Parker Moore ae993cbd6a Merge pull request #4050 from alfredxing/default-font-weight
Merge pull request 4050
2015-10-22 11:22:12 -07:00
Alfred Xing c84627b2e1 Change default font weight to 400 to fix bold/strong text issues 2015-10-22 00:30:14 -07:00
Parker Moore 915f8d3eb6 Update history to reflect merge of #4049
[ci skip]
2015-10-21 11:22:54 -07:00
Parker Moore 36f35bfe00 Merge pull request #4049 from BigBlueHat/icon-refactor
Merge pull request 4049
2015-10-21 11:22:17 -07:00
BigBlueHat d8f38eef0e Made icon-twitter.html inline-able 2015-10-20 09:03:27 -04:00
BigBlueHat 2cde74c44b Use GitHub icon inline in about.md
Had to remove whitespace from icon includes
because Markdown...
2015-10-20 08:56:36 -04:00
BigBlueHat 5d92a90bde Make HTML includes for GitHub & Twitter icons
Made one for each to avoid over paramaterizing
the includes. Also allows for various icon formats.
2015-10-20 08:52:20 -04:00
BigBlueHat c2c671641d Move GitHub & Twitter icons into includes 2015-10-20 08:46:51 -04:00
Parker Moore 9186345eca Update history to reflect merge of #4046
[ci skip]
2015-10-19 10:00:20 -07:00
Parker Moore 4e01722941 Merge pull request #4046 from chrisfinazzo/style-the-test-code
Merge pull request 4046
2015-10-19 09:59:50 -07:00
chrisfinazzo aa9927f073 Apply the highlight class 2015-10-18 23:00:56 -04:00
Parker Moore d63acc140d installation docs: specify Python 2.7 as dep for Jekyll 2
Fixes #4036.
2015-10-17 11:12:01 -07:00
Jordon Bedwell 62d628c7e0 Update history.markdown to reflect the merge of #4032 2015-10-17 06:57:40 -05:00
Jordon Bedwell 271dc42724 Merge pull request #4032 from jekyll/refactor-cleaner-for-expressiveness
Make a constant for the regex to find hidden files
2015-10-17 06:56:55 -05:00
Parker Moore ff55da727e Release 💎 3.0.0.pre.beta10 2015-10-16 12:53:18 -07:00
Jordon Bedwell fb042ef624 Merge pull request #4035 from jaybe-jekyll/patch-2
Remove brackets around _config.yml
2015-10-16 12:09:58 -05:00
jaybe@jekyll 87f9ed94a9 Remove brackets around _config.yml
Referring to _config.yml consistently with <code>
2015-10-16 12:08:29 -05:00
Jordon Bedwell 16c0bf8db8 Update history.markdown to reflect the merge of #4034 2015-10-16 12:02:13 -05:00
Jordon Bedwell 18bdfac542 Merge pull request #4034 from jaybe-jekyll/patch-1
Update usage.md re: _config.yml not reloaded during regeneration
2015-10-16 12:01:16 -05:00
jaybe@jekyll 14f351fc19 Update usage.md re: _config.yml not reloaded during automatic regeneration
_config.yml not reloaded during automatic regeneration
2015-10-16 11:53:31 -05:00
Jordon Bedwell d3e4c93163 Update history.markdown to reflect the merge of #4033 2015-10-16 06:11:36 -05:00
Jordon Bedwell 84089f9ebe Merge pull request #4033 from jekyll/ignore-more-bundler-directories
Ignore `.bundle` when generating test coverage
2015-10-16 06:10:35 -05:00
Matt Rogers b1125f53de Update history to reflect merge of #4004 [ci skip] 2015-10-15 21:13:34 -05:00
Matt Rogers 20303de60d Merge pull request #4004 from kevinoid/excerpt-match-post-content 2015-10-15 21:13:32 -05:00
Matt Rogers ff504a39ba Ignore `.bundle` when generating test coverage
Fix the code coverage reporting when using `.bundle` to store my gems in
by having SimpleCov ignore that directory. Use of `.bundle` to store my
gems consolidates things since since that directory also holds the
bundler config file. It also keeps a `vendor` directory out of the
project tree for non-Rails projects.  Simplecov was not ignoring that
directory though, which meant that the code coverage numbers I were
seeing locally were wrong (and very frightening). With this change, all
is right with the world once again. 😃
2015-10-15 20:59:34 -05:00
Matt Rogers b72556fd03 Make a constant for the regex to find hidden files
A raw regular expression isn't very expressive, IMHO. Rather than having
people who read this code parse the regular expression to figure out
what it's for, let's give a name. This way, it becomes more obvious what
exactly it is we're doing here.
2015-10-15 20:34:44 -05:00
Parker Moore 8add5aec4b Update history to reflect merge of #4029
[ci skip]
2015-10-15 11:38:42 -07:00
Parker Moore 8fec927f83 Merge pull request #4029 from MonsieurV/patch-1
Merge pull request 4029
2015-10-15 11:38:33 -07:00
MonsieurV 63144fd46d Fix pretty permalink example
Following what the documentation specify above for the pretty permalink format (`/:categories/:year/:month/:day/:title/`), it should result for the example to `/2009/04/29/slap-chop/` and not `/2009/04/29/slap-chop/index.html`. Well, at least if I've understood correctly ;-)
2015-10-14 22:12:08 +02:00
Jordon Bedwell 7ae044ee44 Update history.markdown to reflect the merge of #4022 2015-10-11 22:17:37 -05:00
Jordon Bedwell e830e7954c Merge pull request #4022 from chrisfinazzo/fix-the-typos
Fixed a typo, wrap at 80 characters
2015-10-11 22:16:40 -05:00
chrisfinazzo 8e1dd75312 Fixed a typo, wrap at 80 characters 2015-10-11 21:09:44 -04:00
Parker Moore 53f975feb4 Update history to reflect merge of #4018
[ci skip]
2015-10-11 14:50:30 -07:00
Parker Moore 1d9c095b80 Merge pull request #4018 from mudpuddle/alternative-instructions-for-el-capitan
Merge pull request 4018
2015-10-11 14:43:18 -07:00
Parker Moore 2410bcc001 Merge pull request #4021 from stomar/fix-indentation
Avoid "mismatched indentations" warning for ruby -w
2015-10-11 14:38:47 -07:00
Parker Moore e7043ac4f3 Update history to reflect merge of #4013
[ci skip]
2015-10-11 14:37:49 -07:00
Parker Moore fa2c8d2a96 Merge pull request #4013 from antonk52/patch-1
Merge pull request 4013
2015-10-11 14:37:00 -07:00
Anton 3eb25217ce Added installation instructions for 2 of the 3 options for plugins.
Fixes #4013.
2015-10-11 14:36:11 -07:00
Marcus Stollsteimer 45902b2047 Avoid "mismatched indentations" warning for ruby -w 2015-10-11 19:49:40 +02:00
Jesse W 611af3f456 added alternative jekyll gem installation instructions 2015-10-09 11:35:18 -07:00