dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,466 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

6466 Commits

Author SHA1 Message Date
Jordon Bedwell a5b46821ad Put the OS X help guide on the front-lines for now. 2015-11-03 00:11:52 -06:00
Parker Moore f5da607792 Update history to reflect merge of #4090 
[ci skip]
 2015-11-02 12:19:01 +07:00
Parker Moore 05a982e5bc Merge pull request #4090 from paulrobertlloyd/3371-kramdown-highlight 
Merge pull request 4090
 2015-11-02 12:18:21 +07:00
Paul Robert Lloyd e5279d4773 Santize @config['highlighter'] to only allow highlighters supported by kramdown 2015-11-01 23:04:59 +00:00
Jordon Bedwell a64a5b9571 Merge pull request #4091 from jekyll/skip-cucumber-on-jruby 
Skip Cucumber entirely on JRuby.
 2015-10-31 23:07:31 -05:00
Jordon Bedwell 3a225c2ed6 Skip Cucumber entirely on JRuby. 2015-10-31 23:04:52 -05:00
Paul Robert Lloyd 9d1641f163 Fix #3371 - kramdown:syntax_highlighter should automatically take value of highlighter 2015-10-31 23:58:49 +00:00
Alfred Xing a67adabf98 Update history to reflect merge of #4086 2015-10-30 14:53:30 -07:00
Alfred Xing 16844d168a Merge pull request #4086 from XhmikosR/site-font-awesome 
Merge pull request 4086
 2015-10-30 14:52:17 -07:00
XhmikosR 6e30e177d1 Update Font Awesome to v4.4.0. 
Mostly for .woff2 support.
 2015-10-30 22:04:04 +02:00
Jordon Bedwell 121a0471f2 Merge pull request #4087 from XhmikosR/master 
Trim trailing whitespace.
 2015-10-30 15:00:13 -05:00
Jordon Bedwell e007a14cf1 Update history.markdown to reflect the merger of #4085. 2015-10-30 14:59:28 -05:00
Jordon Bedwell 04b2f48bbd Merge pull request #4085 from XhmikosR/site-normalizecss 
Update normalize.css to v3.0.3.
 2015-10-30 14:58:09 -05:00
XhmikosR 3b55bd1a51 Trim trailing whitespace. 
[ci skip]
 2015-10-30 21:57:14 +02:00
XhmikosR 3c60d63f0b Update normalize.css to v3.0.3. 2015-10-30 21:53:32 +02:00
Parker Moore e6afa6f07a Update history to reflect merge of #4079 
[ci skip]
 2015-10-31 03:41:07 +08:00
Parker Moore 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
Parker Moore b50056e8df Update history to reflect merge of #4077 
[ci skip]
 2015-10-31 03:37:45 +08:00
Parker Moore 528ec27df0 Merge pull request #4077 from jekyll/fix_render 
Merge pull request 4077
 2015-10-31 03:36:18 +08:00
Jordon Bedwell 1c4b4ae271 Add regression tests to Cucumber. 2015-10-29 17:19:03 -05:00
Jordon Bedwell 0f4aed9ccf Fix #4066: Move Convertible#render_liquid to using render! 2015-10-29 16:06:17 -05:00
Jordon Bedwell 71f4383d18 Fix #4075: Make sure that .jekyll-metadata is not generated when not needed. 2015-10-29 15:44:38 -05:00
Jordon Bedwell dfae4669e4 AUTOMATIC: Whitespace stripped. 2015-10-29 15:43:55 -05:00
Jordon Bedwell a0f3860cfa Update History.markdown to reflect the merger of #4078. 2015-10-29 15:39:42 -05:00
Jordon Bedwell 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
Jordon Bedwell e5f26b5a36 Fix test warnings when doing rake {test,spec} or script/test 2015-10-29 15:18:19 -05:00
Florian Thomas cf71c563ab Handle empty config files 
SafeYAML.load_file returns `false` when processing empty files so we
convert this into an empty hash for further processing.

fixes #4030
 2015-10-28 22:31:42 +01:00
Parker Moore 8f5465dfa4 site: latest_version.txt is now 3. 2015-10-26 21:13:49 -07:00
Parker Moore 86ea57ba58 Remove 'unreleased' notes. 2015-10-26 21:12:59 -07:00
Parker Moore 031ff12eaf Release 💎 3.0.0 2015-10-26 20:23:00 -07:00
Parker Moore 5082e144d8 Release 💎 3.0.0.pre.rc1 2015-10-26 20:22:53 -07:00
Parker Moore e813e26da4 Merge pull request #4063 from jekyll/3-0-release-post 
Add 3.0 release post.
 2015-10-26 20:18:40 -07:00
Parker Moore 2ca9329a8d Add 3.0 release post. [ci skip] 2015-10-26 19:26:27 -07:00
Parker Moore 12225f49ea Update History to reflect 45f69bb and 7b81f00 [ci skip] 2015-10-26 17:31:05 -07:00
Parker Moore 7b81f00137 Defaults: compare paths in applies_path? as Strings to avoid confusion 
/cc #4064
 2015-10-26 17:28:20 -07:00
Parker Moore 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
Parker Moore 170d6de8d9 Update history to reflect merge of #4062 
[ci skip]
 2015-10-26 16:30:48 -07:00
Parker Moore f25a4ddfda Merge pull request #4062 from jekyll/allow-excerpt-to-live 
Merge pull request 4062
 2015-10-26 16:30:22 -07:00
Parker Moore f8dbbb1288 Clean History.markdown a teensy bit. [ci skip] 2015-10-26 16:16:36 -07:00
Parker Moore e45b6f91e7 Document: Only auto-generate the excerpt if it's not overridden 
Fixes #4061
 2015-10-26 16:08:19 -07:00
Parker Moore 5e425a99b4 Update history to reflect merge of #4060 
[ci skip]
 2015-10-26 15:37:14 -07:00
Parker Moore 7ac05b2b88 Merge pull request #4060 from jekyll/fix-post-url-deprecation-warning 
Merge pull request 4060
 2015-10-26 15:36:48 -07:00
Parker Moore 79c33af3fc post_url: fix access deprecation warning & fix deprecation msg 2015-10-26 14:46:42 -07:00
Parker Moore 35ddbe9398 Release 💎 3.0.0.pre.rc1 2015-10-26 14:42:07 -07:00
Parker Moore 05ba1afc29 Release 💎 v3.0.0.pre.rc1 2015-10-26 14:42:03 -07:00
Parker Moore 6bcef622f5 Update history to reflect merge of #4059 
[ci skip]
 2015-10-26 14:41:40 -07:00
Parker Moore d6176d6010 Merge pull request #4059 from alfredxing/disable-incremental-default 
Merge pull request 4059
 2015-10-26 14:41:03 -07:00
Alfred Xing afd1c21af4 Add `incremental` configuration option to docs 2015-10-26 14:21:07 -07:00
Alfred Xing 2a040fd527 Rename incremental regeneration flag 
Rename from `full_rebuild` to disable, to `incremental` to enable
 2015-10-26 14:20:44 -07:00
Parker Moore ef5e131f53 Update history to reflect merge of #4058 
[ci skip]
 2015-10-26 13:56:35 -07:00