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
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
74734d46f8
Update JRuby on Travis-CI.
2015-10-26 13:55:00 -05:00
7fbe61fc77
Update history to reflect merge of #4053
...
[ci skip]
2015-10-26 09:57:07 -07:00
e9e4a5d21e
Merge pull request #4053 from sparanoid/patch-1
...
Merge pull request 4053
2015-10-26 09:56:03 -07:00
260ad9a3fb
Update history to reflect merge of #4055
...
[ci skip]
2015-10-26 09:53:43 -07:00
e58d0ae0ef
Merge pull request #4055 from jekyll/beefer-collections
...
Merge pull request 4055
2015-10-26 09:53:13 -07:00
b89f943bf2
collections: posts as collection
2015-10-26 00:29:14 -07:00
2f5303dd67
Apply rouge highlighter background to child node
2015-10-26 15:17:04 +08:00
58365ae898
Add missing highlighting CSS class for Rouge
2015-10-25 19:40:40 +08:00
7330b499f1
Update history to reflect merge of #4050
...
[ci skip]
2015-10-22 11:22:38 -07:00
ae993cbd6a
Merge pull request #4050 from alfredxing/default-font-weight
...
Merge pull request 4050
2015-10-22 11:22:12 -07:00
c84627b2e1
Change default font weight to 400 to fix bold/strong text issues
2015-10-22 00:30:14 -07:00
915f8d3eb6
Update history to reflect merge of #4049
...
[ci skip]
2015-10-21 11:22:54 -07:00
36f35bfe00
Merge pull request #4049 from BigBlueHat/icon-refactor
...
Merge pull request 4049
2015-10-21 11:22:17 -07:00
d8f38eef0e
Made icon-twitter.html inline-able
2015-10-20 09:03:27 -04:00
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
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
c2c671641d
Move GitHub & Twitter icons into includes
2015-10-20 08:46:51 -04:00
9186345eca
Update history to reflect merge of #4046
...
[ci skip]
2015-10-19 10:00:20 -07:00
4e01722941
Merge pull request #4046 from chrisfinazzo/style-the-test-code
...
Merge pull request 4046
2015-10-19 09:59:50 -07:00
aa9927f073
Apply the highlight class
2015-10-18 23:00:56 -04:00
d63acc140d
installation docs: specify Python 2.7 as dep for Jekyll 2
...
Fixes #4036 .
2015-10-17 11:12:01 -07:00
62d628c7e0
Update history.markdown to reflect the merge of #4032
2015-10-17 06:57:40 -05:00
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
ff55da727e
Release 💎 3.0.0.pre.beta10
2015-10-16 12:53:18 -07:00
fb042ef624
Merge pull request #4035 from jaybe-jekyll/patch-2
...
Remove brackets around _config.yml
2015-10-16 12:09:58 -05:00
87f9ed94a9
Remove brackets around _config.yml
...
Referring to _config.yml consistently with <code>
2015-10-16 12:08:29 -05:00
16c0bf8db8
Update history.markdown to reflect the merge of #4034
2015-10-16 12:02:13 -05:00
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
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
d3e4c93163
Update history.markdown to reflect the merge of #4033
2015-10-16 06:11:36 -05:00
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
b1125f53de
Update history to reflect merge of #4004 [ci skip]
2015-10-15 21:13:34 -05:00
Parker Moore
Alfred Xing
Jordon Bedwell
Tunghsiao Liu
BigBlueHat
chrisfinazzo
jaybe@jekyll
Matt Rogers