github/jekyll
1
1
Fork 0
mirror of https://github.com/jekyll/jekyll.git synced 2026-01-30 09:18:11 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,086 Commits 60 Branches 160 Tags
dfae4669e4adc2e34ab3a6ecd400ebdf7b5848bb
Commit Graph

2015 Commits

Author SHA1 Message Date
Jordon Bedwell
e5f26b5a36 Fix test warnings when doing rake {test,spec} or script/test 2015-10-29 15:18:19 -05:00
Parker Moore
5082e144d8 Release 💎 3.0.0.pre.rc1 2015-10-26 20:22:53 -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
e45b6f91e7 Document: Only auto-generate the excerpt if it's not overridden 
Fixes #4061
 2015-10-26 16:08:19 -07:00
Parker Moore
79c33af3fc post_url: fix access deprecation warning & fix deprecation msg 2015-10-26 14:46:42 -07:00
Parker Moore
05ba1afc29 Release 💎 v3.0.0.pre.rc1 2015-10-26 14:42:03 -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
2a040fd527 Rename incremental regeneration flag 
Rename from `full_rebuild` to disable, to `incremental` to enable
 2015-10-26 14:20:44 -07:00
Alfred Xing
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
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
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
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
Alfred Xing
c84627b2e1 Change default font weight to 400 to fix bold/strong text issues 2015-10-22 00:30:14 -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
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
Matt Rogers
20303de60d Merge pull request #4004 from kevinoid/excerpt-match-post-content 2015-10-15 21:13:32 -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
Marcus Stollsteimer
45902b2047 Avoid "mismatched indentations" warning for ruby -w 2015-10-11 19:49:40 +02:00
Kevin Locke
bb9462f12f Whole-post excerpts should match the post content 
When a post does not contain an excerpt_separator, meaning the excerpt
includes the entire post, the excerpt should contain exactly the post
content.

This is desirable both from a correctness standpoint, that the excerpt
should not introduce any new content, and more practically to allow fast
and easy detection of whole-post excerpts in Liquid templates using
`post.excerpt == post.content`.  A common use-case is deciding whether
to render "Read More" links on a page containing post excerpts.

This commit does exactly that.  It avoids adding additional newlines to
the excerpt content when the excerpt includes the whole post and adds
tests to ensure that this behavior is correct and preserved going
forward.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
 2015-10-01 13:58:00 -07:00
hartmel
951c604017 Add timezone as hour & minute offset in the initial post in the new site template. Fixes #3998 2015-09-28 22:18:02 +02:00
David Herman
1703b59ce8 Add header message to _config.yml 
The first thing new users to Jekyll do is open _config.yml, so this
change adds a simple welcome message to the top of it. Additionally,
it informs the user that the file is not automatically reloaded when
changed, which is a point of confusion for new users.

Related issue: https://github.com/jekyll/jekyll/issues/2302
 2015-09-25 18:57:46 -07:00
Parker Moore
e193f5a738 Merge pull request #3992 from jekyll/abort-before-confusing-msg 
Merge pull request 3992
 2015-09-24 16:06:26 -07:00
Pedro Euko
22b59ae793 Added permalink time variables 2015-09-23 21:51:02 -03:00
Parker Moore
c7bc76269c Abort if no subcommand. 
Fixes #3412
 2015-09-23 17:32:33 -07:00
Parker Moore
f3b99ebda7 Release 💎 3.0.0.pre.beta9 2015-09-21 12:31:00 -07:00
Jordon Bedwell
908bb2e7af Fix #3970: Use Gem::Version to compare versions, not >. 2015-09-11 14:44:20 -05:00
Alfred Xing
93d282a5c1 Merge pull request #3828 from superlukas/fix-clean-command 
Merge pull request 3828
 2015-09-02 20:22:14 -07:00
Parker Moore
4169075dd1 filters: where should compare stringified versions of input & comparator 
Non-string input was being missed as a result of poor comparison.
Converting inputs to strings ensure numerical and boolean values are
properly compared.

Fixes #3911.
 2015-08-25 23:00:58 -07:00
Ben Balter
1eb1f4ea4d add script to vendor mime types 2015-08-24 16:21:50 -04:00
Parker Moore
8927898e1f Merge pull request #3871 from stevecrozz/3870_hook_trigger_interface_change 
Merge pull request 3871
 2015-08-23 12:55:00 -07:00
Parker Moore
44a43b757d Merge branch 'fniephaus-_includes' into 'master' 
* fniephaus-_includes:
  Unify renaming of configuration options to a single method. /cc #3782.
  Make _includes directory configurable; closes #2684
 2015-08-16 13:30:45 -04:00
Parker Moore
399606c544 Unify renaming of configuration options to a single method. /cc #3782. 2015-08-16 13:30:39 -04:00
Nate Berkopec
559cd6c7e7 Future should be set to false in the default config 2015-08-16 13:11:08 -04:00
Fabio Niephaus
2812341c37 Merge branch 'master' of https://github.com/jekyll/jekyll into _includes 
Conflicts:
	bin/jekyll
 2015-08-09 16:22:33 +01:00
Fabio Niephaus
ac56e9dd16 Make _includes directory configurable; closes #2684 
and rename `plugins`, `layouts` and `data_source` directories for consistency
 2015-08-09 16:20:58 +01:00
Robert Papp
371ca58e69 Fixes #3776 by changing to the correct name for whitelisting. 2015-08-05 00:20:14 +02:00
Parker Moore
14e6809bcd Merge pull request #3838 from gynter/issue-3836 
Merge pull request 3838
 2015-07-28 11:29:01 -07:00
Stephen Crosby
7c4f319442 #3870 trigger hooks by owner symbol 2015-07-27 16:23:07 -07:00
Florian Weingarten
8bdfdae0ab Fix reading of binary metadata file 2015-07-09 13:40:36 -04:00
Günter Kits
b9f8fc1715 Fixes #3836. Fix site template header menu iteration variables 2015-07-06 21:02:56 +03:00
Jensen Kuras
f4bbbd6952 Fixed an unclear code comment 2015-07-06 10:43:28 -07:00
Jordon Bedwell
5bf5c36ce0 Close #3833 by removing execute bit. 2015-07-04 04:59:06 -05:00