Commit Graph

3206 Commits

Author SHA1 Message Date
Parker Moore 9414280aa7 Update history to reflect merge of #2058 [ci skip] 2014-02-18 01:53:47 -05:00
Parker Moore 6a6e66bf9e Merge pull request #2058 from jekyll/layouts-relative-to-config 2014-02-18 01:53:15 -05:00
Matt Rogers b68229aa2c Make LayoutReader#layout_directory public.
Since it's being used in a test, let's go ahead and expose it instead of
dealing with using Object#send to send the message along.
2014-02-17 22:13:29 -06:00
Parker Moore 7706231f16 Update history to reflect merge of #2041 [ci skip] 2014-02-17 16:23:50 -05:00
Parker Moore e5bcddfbe0 Merge pull request #2041 from anthonyjsmith/webrick_index_xml 2014-02-17 16:23:25 -05:00
Parker Moore cf14bc6ab6 Update license with all years since 2008.
Closes #2059.
2014-02-17 12:17:25 -05:00
Parker Moore 1a879a04ab Add tests for determining source dir 2014-02-16 23:19:03 -05:00
Parker Moore 47babef79a Make the layouts: config key relative to CWD or to Source
Fixes #1576.
2014-02-16 22:42:38 -05:00
Parker Moore 84471ba202 Update history to reflect merge of #1946 [ci skip] 2014-02-16 22:14:43 -05:00
Parker Moore 3e91030c81 Merge pull request #1946 from jekyll/security-vuln-patches 2014-02-16 22:14:20 -05:00
Parker Moore ab0ebadee3 Merge master into security-vuln-patches 2014-02-16 22:02:03 -05:00
Parker Moore 264dfc164d When an include cannot be found, only print file path relative to source. 2014-02-16 22:00:33 -05:00
Parker Moore 594e2a94c7 Update history to reflect merge of #2042 [ci skip] 2014-02-16 21:36:40 -05:00
Parker Moore fb8e562123 Merge pull request #2042 from anthonyjsmith/draft-path 2014-02-16 21:36:00 -05:00
Parker Moore c4f5415ece Update history to reflect merge of #2056 [ci skip] 2014-02-16 21:12:03 -05:00
Parker Moore effe84cd56 Merge pull request #2056 from herr-biber/remove-executable-bits 2014-02-16 21:11:40 -05:00
Markus Roth c47751148c Remove executable bits of non executable files. 2014-02-17 01:41:12 +01:00
Parker Moore c6b4c41aab Update history to reflect merge of #2048 [ci skip] 2014-02-15 17:28:06 -05:00
Parker Moore d36d1f3cc0 Merge pull request #2048 from ZDroid/mkdown-ext 2014-02-15 17:27:52 -05:00
Parker Moore 8d39bf3850 Update history to reflect merge of #2049 [ci skip] 2014-02-15 17:26:34 -05:00
Parker Moore 51f367b5e0 Merge pull request #2049 from ZDroid/kramdown-reorder 2014-02-15 17:25:27 -05:00
Zlatan Vasović 7115bfbf3d Reorder Maruku and Kramdown
Kramdown is default now, yay!
2014-02-15 23:12:31 +01:00
Zlatan Vasović 699066ef85 Add `.mkdown` as valid Markdown extension
GitHub Linguist recognizes `.mkdown` as Markdown, so Jekyll should support it as Jekyll is used on GitHub pages.
2014-02-15 22:01:37 +01:00
Parker Moore 7b1321d002 Update link to rack-jekyll
Ports change from #2047 to master.
2014-02-14 15:53:50 -05:00
Parker Moore da446c0f19 Update history to reflect merge of #2047 [ci skip] 2014-02-14 15:41:07 -05:00
Matt Rogers c77ef87b05 Update history to reflect merge of #2045 2014-02-14 12:46:10 -06:00
Matt Rogers 41325ab308 Merge pull request #2045 from jekyll/kill-1-9-2 2014-02-14 12:46:07 -06:00
Parker Moore 49606cb509 Update rebund credentials to speed up TravisCI builds.
Requests to jekyll's keyfile instance seem to be 401ing.
2014-02-14 13:44:31 -05:00
Parker Moore 1482c8aecc Update history to reflect merge of #2044 [ci skip] 2014-02-14 13:36:32 -05:00
Parker Moore 611145e712 Merge pull request #2044 from jekyll/bump-redcarpet 2014-02-14 13:36:08 -05:00
Parker Moore 36b2963343 Kill 1.9.2 support. 2014-02-14 13:30:14 -05:00
Matt Rogers ad9250d106 Bump Redcarpet to 3.1.0
- Footnotes
- GitHub style header anchors
- quotation marks as <q> tags
- A few other bug fixes
2014-02-14 12:17:29 -06:00
Anthony Smith 86208d8c33 Add index.xml to WEBrick DirectoryIndex
Resolves #2040
2014-02-13 23:12:36 +00:00
Parker Moore 1671d34e15 Release 2.0.0.alpha.1 2014-02-13 18:02:53 -05:00
Parker Moore 88e35f0852 Release 2.0.0.alpha.1 2014-02-13 18:02:49 -05:00
Parker Moore 729b6db7c2 Update history to reflect merge of #2009 [ci skip] 2014-02-13 17:56:57 -05:00
Parker Moore d43341fab0 Merge pull request #2009 from penibelst/test-sass-include 2014-02-13 17:56:38 -05:00
Matt Rogers ac7bed335a Merge pull request #1976 from jekyll/fix-pagination-issue
Relative posts should never fail to build, even if @dir or @name is nil
2014-02-13 12:39:23 -06:00
Matt Rogers & Persa Zula ec93743659 Update history to reflect merge of #1976 2014-02-13 12:39:00 -06:00
Parker Moore 54e5e660db Update history to reflect merge of #2031 [ci skip] 2014-02-13 12:54:21 -05:00
Parker Moore 83f5b4d93b Merge pull request #2031 from jekyll/utf8-heart 2014-02-13 12:53:58 -05:00
Parker Moore 8929d1bd63 Update history to reflect merge of #2038 [ci skip] 2014-02-13 12:52:54 -05:00
Parker Moore 3b5f6494f2 Merge pull request #2038 from joshbrw/master 2014-02-13 12:52:28 -05:00
Josh Brown 69dc96dc9f Removed accidental linebreak 2014-02-13 13:28:11 +00:00
Josh Brown 933590b6ba Added a breakpoint for .site to make it responsive 2014-02-13 13:27:34 +00:00
Parker Moore c58c5b8782 Default to using the UTF-8 encoding when reading files.
Fixes #2029.
2014-02-11 17:48:52 -05:00
Anthony Smith 18279558da Update #relative_path for _drafts and add tests.
Resolves #2019. Add new tests for drafts. Also check path variable in
test for posts.
2014-02-11 12:48:34 +00:00
Parker Moore 56a633ae95 Update Jekyll version to latest released.
Latest release can be found on the v1-stable branch.
2014-02-09 18:44:30 -05:00
Parker Moore f607aefeb8 Update jekyll.gemspec with new files.
Ref: #2020
2014-02-09 18:43:46 -05:00
Parker Moore b6c8b39899 Update history to reflect merge of #1988 [ci skip] 2014-02-08 17:08:30 -05:00