f5da607792
Update history to reflect merge of #4090
...
[ci skip]
2015-11-02 12:19:01 +07:00
05a982e5bc
Merge pull request #4090 from paulrobertlloyd/3371-kramdown-highlight
...
Merge pull request 4090
2015-11-02 12:18:21 +07:00
e5279d4773
Santize @config['highlighter'] to only allow highlighters supported by kramdown
2015-11-01 23:04:59 +00:00
a64a5b9571
Merge pull request #4091 from jekyll/skip-cucumber-on-jruby
...
Skip Cucumber entirely on JRuby.
2015-10-31 23:07:31 -05:00
3a225c2ed6
Skip Cucumber entirely on JRuby.
2015-10-31 23:04:52 -05:00
9d1641f163
Fix #3371 - kramdown:syntax_highlighter should automatically take value of highlighter
2015-10-31 23:58:49 +00:00
a67adabf98
Update history to reflect merge of #4086
2015-10-30 14:53:30 -07:00
16844d168a
Merge pull request #4086 from XhmikosR/site-font-awesome
...
Merge pull request 4086
2015-10-30 14:52:17 -07:00
6e30e177d1
Update Font Awesome to v4.4.0.
...
Mostly for .woff2 support.
2015-10-30 22:04:04 +02:00
121a0471f2
Merge pull request #4087 from XhmikosR/master
...
Trim trailing whitespace.
2015-10-30 15:00:13 -05:00
e007a14cf1
Update history.markdown to reflect the merger of #4085 .
2015-10-30 14:59:28 -05:00
04b2f48bbd
Merge pull request #4085 from XhmikosR/site-normalizecss
...
Update normalize.css to v3.0.3.
2015-10-30 14:58:09 -05:00
3b55bd1a51
Trim trailing whitespace.
...
[ci skip]
2015-10-30 21:57:14 +02:00
3c60d63f0b
Update normalize.css to v3.0.3.
2015-10-30 21:53:32 +02:00
e6afa6f07a
Update history to reflect merge of #4079
...
[ci skip]
2015-10-31 03:41:07 +08:00
48b23858ad
Merge pull request #4079 from jekyll/fix-jekyll-metdata-being-generated-on-non-incremental
...
Merge pull request 4079
2015-10-31 03:40:32 +08:00
b50056e8df
Update history to reflect merge of #4077
...
[ci skip]
2015-10-31 03:37:45 +08:00
528ec27df0
Merge pull request #4077 from jekyll/fix_render
...
Merge pull request 4077
2015-10-31 03:36:18 +08:00
1c4b4ae271
Add regression tests to Cucumber.
2015-10-29 17:19:03 -05:00
0f4aed9ccf
Fix #4066 : Move Convertible#render_liquid to using render!
2015-10-29 16:06:17 -05:00
71f4383d18
Fix #4075 : Make sure that .jekyll-metadata is not generated when not needed.
2015-10-29 15:44:38 -05:00
dfae4669e4
AUTOMATIC: Whitespace stripped.
2015-10-29 15:43:55 -05:00
a0f3860cfa
Update History.markdown to reflect the merger of #4078 .
2015-10-29 15:39:42 -05:00
3e5a1af234
Merge pull request #4078 from jekyll/fix-test-warnings
...
Fix test warnings when doing rake {test,spec} or script/test
2015-10-29 15:37:53 -05:00
e5f26b5a36
Fix test warnings when doing rake {test,spec} or script/test
2015-10-29 15:18:19 -05:00
8f5465dfa4
site: latest_version.txt is now 3.
2015-10-26 21:13:49 -07:00
86ea57ba58
Remove 'unreleased' notes.
2015-10-26 21:12:59 -07:00
031ff12eaf
Release 💎 3.0.0
2015-10-26 20:23:00 -07:00
5082e144d8
Release 💎 3.0.0.pre.rc1
2015-10-26 20:22:53 -07:00
e813e26da4
Merge pull request #4063 from jekyll/3-0-release-post
...
Add 3.0 release post.
2015-10-26 20:18:40 -07:00
2ca9329a8d
Add 3.0 release post. [ci skip]
2015-10-26 19:26:27 -07:00
12225f49ea
Update History to reflect 45f69bb and 7b81f00 [ci skip]
2015-10-26 17:31:05 -07:00
7b81f00137
Defaults: compare paths in applies_path? as Strings to avoid confusion
...
/cc #4064
2015-10-26 17:28:20 -07:00
45f69bb8cd
Utils: deep_merge_hashes should also merge default_proc
...
If the target hash's default_proc isn't set, overwrite with the new hash's default_proc.
/cc #4064
2015-10-26 17:27:36 -07:00
170d6de8d9
Update history to reflect merge of #4062
...
[ci skip]
2015-10-26 16:30:48 -07:00
f25a4ddfda
Merge pull request #4062 from jekyll/allow-excerpt-to-live
...
Merge pull request 4062
2015-10-26 16:30:22 -07:00
f8dbbb1288
Clean History.markdown a teensy bit. [ci skip]
2015-10-26 16:16:36 -07:00
e45b6f91e7
Document: Only auto-generate the excerpt if it's not overridden
...
Fixes #4061
2015-10-26 16:08:19 -07:00
5e425a99b4
Update history to reflect merge of #4060
...
[ci skip]
2015-10-26 15:37:14 -07:00
7ac05b2b88
Merge pull request #4060 from jekyll/fix-post-url-deprecation-warning
...
Merge pull request 4060
2015-10-26 15:36:48 -07:00
79c33af3fc
post_url: fix access deprecation warning & fix deprecation msg
2015-10-26 14:46:42 -07:00
35ddbe9398
Release 💎 3.0.0.pre.rc1
2015-10-26 14:42:07 -07:00
05ba1afc29
Release 💎 v3.0.0.pre.rc1
2015-10-26 14:42:03 -07:00
6bcef622f5
Update history to reflect merge of #4059
...
[ci skip]
2015-10-26 14:41:40 -07:00
d6176d6010
Merge pull request #4059 from alfredxing/disable-incremental-default
...
Merge pull request 4059
2015-10-26 14:41:03 -07:00
afd1c21af4
Add `incremental` configuration option to docs
2015-10-26 14:21:07 -07:00
2a040fd527
Rename incremental regeneration flag
...
Rename from `full_rebuild` to disable, to `incremental` to enable
2015-10-26 14:20:44 -07:00
ef5e131f53
Update history to reflect merge of #4058
...
[ci skip]
2015-10-26 13:56:35 -07:00
8738a66f9f
Merge pull request #4058 from jekyll/method_missing_madness
...
Merge pull request 4058
2015-10-26 13:55:34 -07:00
d9b12bc090
Disable incremental regeneration by default in Jekyll 3.0
...
Disable the feature as it's still not 100% working 100% of the time. Feature
can be re-enabled by specifying `full_rebuild: false` in the configuration
2015-10-26 13:37:47 -07:00
Parker Moore
Paul Robert Lloyd
Jordon Bedwell
Alfred Xing
XhmikosR