33255e3ac3
IncludeTag: implement multiple load paths
2016-03-25 17:44:29 -07:00
0920d2b48a
LayoutReader#read: read in Theme layouts if they aren't already registered
2016-03-25 17:06:26 -07:00
a30068bf3f
Merge remote-tracking branch 'origin/master' into themes
...
* origin/master: (65 commits)
Update history to reflect merge of #4703 [ci skip]
Update history to reflect merge of #4712 [ci skip]
Highlight the test code
Update history to reflect merge of #4640 [ci skip]
readded "env=prod"-condition
Update history to reflect merge of #3849 [ci skip]
Update history to reflect merge of #4624 [ci skip]
Update history to reflect merge of #4704 [ci skip]
Update history to reflect merge of #4706 [ci skip]
Checks for link file extension in tests
Updating assets documentation
Fix test teardown for cleaner.
Update history to reflect merge of #4542 [ci skip]
Add explanation of site variables in the example _config.yml
Use double quotes in the gemfile
Add test for creation of Gemfile by 'jekyll new'
Add comment about github-pages
Update history to reflect merge of #4533 [ci skip]
Ensure Rouge closes its div/figure properly after highlighting ends.
Add Site#config= which can be used to set the config
...
2016-03-25 16:30:25 -07:00
a1a4b3937a
Add Layout#relative_path so the layout can tell us what its path is for error messages
2016-03-25 16:29:37 -07:00
afa89d68f8
Merge pull request #4703 from jekyll/after_init_hook
...
Merge pull request 4703
2016-03-25 16:27:38 -07:00
1ab0ed3664
Merge pull request #4640 from surrim/symlink_static_files
...
Merge pull request 4640
2016-03-25 12:19:17 -07:00
bdaa0c3b5b
register sass path
2016-03-25 14:46:00 -04:00
9be387ef6f
readded "env=prod"-condition
2016-03-25 19:42:53 +01:00
7a4817e55a
Merge pull request #3849 from shinkondo/master
...
Merge pull request 3849
2016-03-24 13:54:03 -07:00
da4a664290
Merge pull request #4624 from jeffkole/feature/add-collection-url-tag
...
Merge pull request 4624
2016-03-24 12:50:05 -07:00
59d1a122c6
Merge pull request #4704 from jekyll/parkr-patch-1
...
Merge pull request 4704
2016-03-24 12:40:49 -07:00
87d0f03f5c
Merge pull request #4542 from jekyll/jekyll-new-with-gemfile
...
Merge pull request 4542
2016-03-23 17:49:46 -07:00
7695ba6eb4
Add explanation of site variables in the example _config.yml
2016-03-23 17:44:11 -07:00
01d48320fd
Merge remote-tracking branch 'upstream/master'
2016-03-23 19:33:22 -05:00
22d9312eaf
Use double quotes in the gemfile
2016-03-23 17:25:19 -07:00
09f9f193d8
Add comment about github-pages
2016-03-23 17:15:35 -07:00
4ce50e3936
Merge pull request #4533 from hgoodman/feature/show-dir-listing
...
Merge pull request 4533
2016-03-23 17:01:16 -07:00
9b60df8883
Add Site#config= which can be used to set the config
2016-03-23 13:14:30 -07:00
84b7d9b3ac
Add Hook for :site :after_init
2016-03-23 13:14:08 -07:00
b06af5a44f
Use encode for xml_escape filter
2016-03-21 11:07:46 -07:00
848b1358a1
Merge pull request #4491 from jekyll/ignore-tilde
...
Merge pull request 4491
2016-03-20 15:34:35 -07:00
4b32bd2b13
Updates code styling per PR
2016-03-17 14:26:13 -07:00
f79f9d60a9
Changes `collection_url` tag to `link` tag
2016-03-17 14:01:04 -07:00
4883a24363
PostComparer#post_date use the provided date instead of re-parsing the whole name.
2016-03-15 16:08:32 -07:00
97efa0f0ce
Clean up Tags::PostUrl a bit
2016-03-15 16:06:25 -07:00
285aa54445
remove even more asset support
2016-03-11 16:18:11 -05:00
e3c71ea407
Merge branch 'master' into themes
2016-03-11 14:44:44 -05:00
92168954d2
remove asset support
2016-03-11 14:41:26 -05:00
2ea3bc53d3
Merge pull request #4653 from mlinksva/patch-2
...
Merge pull request 4653
2016-03-11 13:35:22 -06:00
4948b5a3b3
change smartify doc from copy/paste of mardownify doc
2016-03-11 11:09:03 -08:00
64d5e3dfd3
removed "env=prod"-condition
2016-03-11 19:26:16 +01:00
79f8210fff
'jekyll clean': also remove .sass-cache
2016-03-11 10:04:36 -08:00
52eb60e171
use copy_entry only in safe mode
2016-03-11 18:45:40 +01:00
9e0ed00a59
Merge pull request #4555 from timwis/patch-1
...
Merge pull request 4555
2016-03-08 16:25:15 -08:00
9520d9bbf9
Merge pull request #4636 from HugoGiraudel/patch-4
2016-03-08 16:04:02 -06:00
eb341514a7
use def_delegator
2016-03-08 11:55:16 -05:00
e8617cf7cd
better theme-not-found handling
2016-03-08 11:53:29 -05:00
13912482ad
Adding a debug log statment for skipped future posts.
...
For https://github.com/jekyll/jekyll/issues/4507
2016-03-07 22:10:10 +00:00
c86fba6fb3
use /assets for theme assets, not _assets
2016-03-06 15:42:08 -05:00
46bdaa49dc
using FileUtils.copy_entry instead of FileUtils.cp to allow symlinks
2016-03-05 23:31:16 +01:00
8b880cb993
add theme tests
2016-03-05 13:35:52 -05:00
ada7c4f441
revert layout reader
2016-03-05 13:05:57 -05:00
47416169c3
add sass path
2016-03-05 13:05:11 -05:00
8bfb9e51f3
Merge branch 'master' into themes
2016-03-05 13:04:15 -05:00
37cc45239d
Merge pull request #4635 from HugoGiraudel/patch-3
...
Added role="banner" to <header>
2016-03-05 02:22:10 -06:00
664206608d
Removed unnecessary nesting from _base.scss
2016-03-04 17:40:19 +01:00
90e83e0636
Changed main <div> to <main> and added aria-label="Content"
2016-03-04 17:33:44 +01:00
09b9db259c
Added role="banner" to <header>
2016-03-04 17:32:21 +01:00
ff91463c43
Added a default lang attribute
2016-03-04 17:03:26 +01:00
b80a0cb5ce
Adds collection_tag
...
This tag mirrors the post_tag functionality but for collections instead of just
posts.
2016-03-02 14:56:30 -08:00
Parker Moore
jekyllbot
Ben Balter
surrim
Shinn Kondo
Pat Hawks
Jeff Kolesky
Mike Linksvayer
Matt Rogers
Zack Spencer
Jordon Bedwell
Hugo Giraudel