0c2d7c0864
Restrict mime-types gem to pre-2.0.
...
A coveralls dep has a '>=' dependency on mime-types.
2013-10-28 14:16:10 -04:00
a0a9c5f676
Allow any versions of listen < 2.0 and >= 1.3
2013-10-28 14:04:37 -04:00
3ab9841272
Fix 1.8.7 syntax errors.
2013-10-28 14:03:34 -04:00
f0d0cbf947
Referencing the documentation for jekyll-import installation
...
Currently, there are only beta releases of the jekyll-import gem, so to
install it, you have to do `gem install jekyll-import --pre`. Instead
of giving instructions that don't work right now, reference the
documentation. That way, this doesn't need to be updated again when
jekyll-import has a non-beta version; just the documentation will need
updating.
2013-10-27 18:04:16 -04:00
1eb55119a3
Update history to reflect merge of #1663
2013-10-26 22:11:13 -05:00
9ce042c54f
Merge pull request #1663 from penibelst/emphasize-date-filters
...
Change day example to emphasize the leading zero
2013-10-26 20:10:19 -07:00
71d4319d5f
Downgrade Listen to 1.3.x
...
This is so that we can be Ruby 1.8.x compatible.
2013-10-26 22:08:38 -05:00
6949006051
Update history to reflect merge of #1405
2013-10-26 21:59:08 -05:00
4d1a6973ed
Merge pull request #1405 from GSI/master
...
documented new gem 'jekyll_image_encode' in the plugins list
2013-10-26 19:57:36 -07:00
d14553cf75
Change day example to a one-digit
2013-10-27 01:28:58 +02:00
5bdb9eb041
documented 'jekyll_date_chart', 'jekyll_image_encode' and 'jekyll_quick_man' in the plugins list
2013-10-26 17:48:51 -02:00
727a705d67
Update history to reflect merge of #1660
2013-10-25 10:00:05 -05:00
4f8b6aaa7e
Merge pull request #1660 from mojombo/fix-shorts
...
Change short version of '--verbose' to '-V'
2013-10-25 07:58:06 -07:00
ce0b8d2834
Change short version of '--verbose' to '-V'
...
https://github.com/mojombo/jekyll/pull/1518
https://github.com/mojombo/jekyll/issues/1659
2013-10-24 10:30:19 -04:00
9b40ae6b36
Update history to reflect merge of #1582
2013-10-23 22:59:43 -05:00
bd825924b2
Merge pull request #1582 from mojombo/seconds_agnostic_time
...
Get some nice Regexp which is agnostic about the seconds.
2013-10-23 22:57:18 -05:00
112aa8112d
Update history to reflect merge of #1651
2013-10-23 22:51:13 -05:00
f697d12027
Merge pull request #1651 from liufengyun/jsonify
...
support jsonify filter
2013-10-23 20:50:14 -07:00
2397a16658
Update history to reflect merge of #1493
2013-10-23 22:49:50 -05:00
fb6f8c1ff1
Merge pull request #1493 from maul-esel/feature-improvements
...
Improve features / tests code
2013-10-23 20:49:11 -07:00
2c11a6ec27
Update history to reflect merge of #1589
2013-10-23 22:47:01 -05:00
2287eed0c6
Merge pull request #1589 from dchest/better-watch
...
Replace directory_watcher with listen.
2013-10-23 22:38:56 -05:00
32c7530ea6
Update history to reflect merge of #1656
2013-10-23 22:37:44 -05:00
2d7a4c69ec
Merge pull request #1656 from mojombo/plugin-gems-docs
...
Add docs for new 'gems' option.
2013-10-23 20:35:56 -07:00
811b14412f
Add docs for new 'gems' option.
2013-10-23 10:48:23 -04:00
6c001f10ab
Update history to reflect merge of #1557
2013-10-23 09:40:39 -05:00
23ad7fa4bd
Merge pull request #1557 from mojombo/require-gems-plugins
...
Add `gems` for better plugin management
2013-10-23 07:39:43 -07:00
f971aebfb1
support jsonify filter
2013-10-22 23:52:22 +08:00
12ba0a541c
Update listen to ~> 2.0.
2013-10-18 11:04:54 +02:00
58ae8bc0cd
Update history to reflect merge of #1543
2013-10-17 08:36:29 -05:00
0e784596a5
Merge pull request #1543 from maul-esel/fix-coderay
...
Add tests for special handling of kramdown's coderay options
2013-10-17 06:35:43 -07:00
3cd230d66e
Update history to reflect merge of #1637
2013-10-17 08:23:26 -05:00
f8f58d2f68
Merge pull request #1637 from maul-esel/options-duplication
...
move cmd param setup for build into own method
2013-10-17 06:22:55 -07:00
6e77788a06
Update history to reflect merge of #1638
2013-10-17 08:21:47 -05:00
1fd549c01f
Merge pull request #1638 from maul-esel/render-page-or-post
...
Refactor Site#render
2013-10-17 06:21:10 -07:00
c2aa26280c
extract pages.any?... in own method
2013-10-17 15:17:58 +02:00
b0ae2c69c9
Update history to reflect merge of #1636
2013-10-17 08:13:28 -05:00
1682dc8290
Merge pull request #1636 from pda/patch-1
...
Build status badge in README refers to master branch.
2013-10-17 06:12:32 -07:00
f0aac30491
remove duplicated render code for posts and pages
2013-10-17 12:07:30 +02:00
7232948b62
simplify relative permalink deprecation
2013-10-17 12:06:21 +02:00
5cf6f2c2d1
move cmd param setup for build into own method to avoid duplication
2013-10-17 11:32:26 +02:00
0f30aca76a
Build status badge in README refers to master branch.
...
Otherwise, experimental branches being pushed can cause the badge
in the README (master branch, GitHub front page) to show the build
failing.
2013-10-16 12:54:25 -07:00
61e6a834cb
Update history to reflect merge of #1635
2013-10-16 10:10:28 -05:00
6cdb7ec833
Merge pull request #1635 from dpassage/patch-1
...
Fix grammar in usage.md
2013-10-16 08:09:19 -07:00
c017174dad
Fix grammar in usage.md
2013-10-16 07:47:18 -07:00
2b275ef192
oops, fix minor indentation quirk
2013-10-15 14:38:45 +02:00
96a37ac1ab
document frontmatter defaults precedence
2013-10-15 14:25:47 +02:00
dd851943c0
adjust frontmatter defaults precedence handling
...
Before, the bottom-most default set had highest precedence. Instead,
now the set with a longer i.e. more specific path has precedence and
sets with a type setting have precedence over those without one. In
case of equal precedence the bottom-most still wins.
2013-10-15 14:18:44 +02:00
32b4de3ea6
change cucumber feature to test for precedence too
2013-10-15 13:32:49 +02:00
20ea0c8d56
Merge branch 'master' into frontmatter-defaults
2013-10-14 19:44:06 +02:00
Parker Moore
Carol Nichols
Matt Rogers
Anatol Broder
GSI2013
liufengyun
Dmitry Chestnykh
maul.esel
Paul Annesley
David Paschich