Commit Graph

3336 Commits

Author SHA1 Message Date
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
Parker Moore dd3018ce02 Merge pull request #1988 from jekyll/maruku-to-kramdown 2014-02-08 17:07:54 -05:00
Parker Moore 22f2001ff5 Set default markdown converter to Kramdown
- Update default markdown converter in docs for configuration
- Update tests so they are in line with Kramdown output
- Add deprecation message to when config is built
2014-02-08 13:17:46 -05:00
Anatol Broder c17ed7ec93 Add comment about symlinked directories 2014-02-08 13:26:03 +01:00
Parker Moore 1176fc6f57 Give File.join the strings from the array 2014-02-08 00:38:59 -05:00
Parker Moore 2e2563fab9 Update history to reflect merge of #2015 [ci skip] 2014-02-08 00:34:16 -05:00
Parker Moore 41401ef126 Merge pull request #2015 from aheckler/master 2014-02-08 00:34:01 -05:00
Parker Moore 71b2257829 Update history to reflect merge of #2016 [ci skip] 2014-02-08 00:33:32 -05:00
Parker Moore 00ac5ff3d4 Merge pull request #2016 from Jashank/destination-warning 2014-02-08 00:33:12 -05:00
Parker Moore a63e62f643 Update history to reflect merge of #2020 [ci skip] 2014-02-08 00:32:20 -05:00
Parker Moore 8f3e3e04d8 Merge pull request #2020 from jekyll/refactor-layout-reading 2014-02-08 00:31:41 -05:00
Parker Moore ac8d8a7cb8 Fix some tests 2014-02-08 00:31:26 -05:00
Matt Rogers & Persa Zula c36a6d3e0d Wrap the LayoutReader in the Jekyll module 2014-02-06 23:07:38 -06:00
Matt Rogers & Persa Zula 833b40095f Rename `with` to `within`
Thanks @parkr
2014-02-06 23:07:11 -06:00
Matt Rogers & Persa Zula fd92820b03 Remove Site#read_layouts 2014-02-06 22:46:09 -06:00
Matt Rogers & Persa Zula facf115c04 Move layout tests from site to its own file 2014-02-06 22:45:51 -06:00
Matt Rogers 70ecef0094 Sort methods from most important to least important
This idea is based on the concept of a newspaper. The most important
things such as the headlines and the major details of the story at the
top. This translates to code in that the public API and the more
important private methods are at the top of the file. The more detailed
information (or methods, in the code) are further down, so that if
you've gotten all you need out of the code up to a certain point, you
don't need to keep reading anymore.
2014-02-06 22:22:06 -06:00
Matt Rogers c5b81d580b Refactor the LayoutReader class 2014-02-06 22:22:06 -06:00
Matt Rogers f581940c71 Create a LayoutReader class to read layouts 2014-02-06 22:22:06 -06:00
Parker Moore f638fb1784 Merge master into security-vuln-patches 2014-02-06 17:21:54 -05:00
Jashank Jeremy 67a54547ed Clarifying wording of the destination directory warning.
At some point, it should also be clarified whether "folder" or
"directory" is the correct way to refer to that concept.
2014-02-05 10:38:16 +11:00