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
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
Jordon Bedwell
3a49770ce2
Merge pull request #3823 from 18F/adapt-static-file
...
Adapt StaticFile for collections, config defaults
2015-07-01 12:06:08 -05:00
Mike Bland
250b6ebb7e
Adapt StaticFile for collections, config defaults
...
This enables files such as images and PDFs to show up in the same relative
output directory as other HTML and Markdown documents in the same collection.
It also enables static files to be hidden using defaults from _config.yml in
the same way that other documents in the same collection and directories may
be hidden using `published: false`.
2015-06-29 19:58:27 -04:00
Parker Moore
8c9e9497a2
Release 💎 3.0.0.pre.beta8
2015-06-29 14:33:38 -07:00
Florian Weingarten
3c656ae2ed
Remove unnecessary 'ensure' in LiquidRenderer
2015-06-23 21:27:24 +00:00
Parker Moore
5647b91689
Release 💎 3.0.0.pre.beta7
2015-06-18 20:52:40 -07:00
Parker Moore
8b44a7bb42
Merge pull request #3762 from fw42/liquid_profiler
...
Merge pull request 3762
2015-06-16 10:21:33 -07:00
Jordon Bedwell
137efdc9f4
Fix : #3738 ; Move code wrapper from div to figure.
2015-06-10 15:20:44 -05:00
Florian Weingarten
7bc9e1aae6
Add byte counter
2015-06-07 16:49:22 +00:00
Florian Weingarten
1e9163fdf4
Liquid profiler
2015-06-07 16:38:05 +00:00
Jordon Bedwell
e9215ec047
Merge pull request #3732 from jekyll/fix-frontmatter-defaults
...
Fix it so that 'blog.html' matches 'blog.html'
2015-06-06 06:30:43 -05:00
Parker Moore
a134e05fda
Release 💎 3.0.0.pre.beta6
2015-06-04 16:57:13 -07:00
Alfred Xing
bba7870f8b
Merge pull request #3717 from alfredxing/regenerator-handle-deleted-files
...
Merge pull request 3717
2015-05-31 11:10:42 -07:00
Seb
e68d18c3cc
Update link in welcome post to talk.jekyllrb.com
...
Previously the link pointed to the jekyll-help repository on github
which no longer accepts issues.
2015-05-28 21:19:24 +02:00
Jordon Bedwell
14ed5cc954
Fix it so that 'blog.html' matches 'blog.html'
2015-05-25 02:07:21 -05:00
Alfred Xing
a2ee820609
Regenerator: handle deleted/renamed/moved dependencies
...
Should fix #3716
2015-05-19 22:47:58 -07:00
Florian Weingarten
376c87b62e
Don't crash when reading/writing Marshal
2015-05-19 15:51:55 +00:00
Parker Moore
73db98c244
Release 💎 3.0.0.pre.beta5
2015-05-19 10:54:37 +07:00
Jordon Bedwell
498ea4fd24
Merge pull request #3706 from fw42/marshal_metadata
...
Performance: Marshal metadata
2015-05-18 09:17:42 -05:00
Florian Weingarten
3474481043
Marshal metadata
2015-05-18 14:02:43 +00:00
Florian Weingarten
5928618de1
Performance: Sort files only once
2015-05-18 13:56:56 +00:00
Jordon Bedwell
ae11cae659
Fix #3653 : Add a doctor helper to test pwd's.
2015-05-17 02:46:40 -05:00
Florian Weingarten
15c4d9bee2
Jekyll::Cleaner#existing_files: Call keep_file_regex and keep_dirs only once, not per iteration
2015-05-11 22:01:10 +00:00
Parker Moore
ba12d28fbe
Release 💎 v3.0.0.pre.beta4
2015-05-10 01:10:57 -07:00
Parker Moore
ce9fcfaebb
Merge pull request #3553 from stevecrozz/jekyll-hooks
...
Merge pull request 3553
2015-05-09 23:58:46 -07:00
Florian Weingarten
f99abc5314
Cache Document#to_liquid
2015-05-10 03:51:50 +00:00
Parker Moore
4b038259c7
Release 💎 v3.0.0.pre.beta3
2015-05-06 23:19:23 -07:00
Stephen Crosby
79a178f7f1
move document.post_render hook to after render call
2015-05-03 13:53:28 -07:00
Stephen Crosby
736e6a78f1
address code review feedback from #3553
...
- change site:reset to site:after_reset
- raise an exception when registering uncallable hook
- set default hook priority at the public API level
2015-05-02 15:56:19 -07:00
Stephen Crosby
245d9677d7
Refine hook implementation
...
- hooks are registered to symbol owners rather than classes directly
- during registration, add the ability to specify owner as an array to
register the same hook to multiple owners
- add optional priority during registration as a symbol (:low, :normal,
:high)
- implement hooks for collections as they are in octopress-hooks, aside
from post_init
2015-05-01 19:00:37 -07:00
Stephen Crosby
6ca9633354
prototype of jekyll hooks, encapsulated
2015-05-01 14:35:15 -07:00
Bernardo Dias
8546298047
fix collections output, see #2346
2015-04-29 10:49:06 -07:00
Alfred Xing
9ab3c201c8
Remove relative permalinks
2015-04-28 14:03:20 -07:00
Jim Meyer
269662d0f0
DRY config value fetching
...
Adds #get_config_value_with_override, refactoring the three fetch
methods to use it.
2015-04-18 16:59:36 -07:00
Jim Meyer
9c03fc3f27
Set logging to debug when verbose flag is set
...
Adds Jekyll::LogAdapter#adjust_verbosity which ensures that --quiet
always wins.
2015-04-18 16:57:57 -07:00
Parker Moore
f908051aa4
mime.types: remove extraneous hyphen before comment
2015-04-14 17:15:08 -07:00
Parker Moore
ab83f0bf2e
Merge pull request #3649 from schneems/schneems/utf8-myhomework
...
Merge pull request 3649
2015-04-14 16:51:21 -07:00
schneems
701617cb0e
Fix header for RSS feeds with UTF8 characters.
...
```
$ curl http://localhost:4000/feed.xml -I
HTTP/1.1 200 OK
Etag: 64af8c-2356-552805aa
Content-Type: text/xml; charset=utf-8
Content-Length: 9046
Last-Modified: Fri, 10 Apr 2015 17:17:30 GMT
Server: WEBrick/1.3.1 (Ruby/2.2.1/2015-02-26)
Date: Fri, 10 Apr 2015 17:17:34 GMT
Connection: Keep-Alive
```
Originally contributed to https://github.com/fitztrev/jekyll-utf8/pull/3
2015-04-14 18:21:25 -04:00
Parker Moore
0072865512
Merge pull request #3629 from justinweiss/lsi_search_on_posts
...
Merge pull request 3629
2015-04-14 13:13:24 -07:00
Parker Moore
ff3edbc16b
static files mtime liquid should return a Time obj
2015-04-14 11:52:25 -07:00