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
3,200 Commits 60 Branches 160 Tags
e5bcddfbe05171ffa19fcc70dfc630f32ef25da3
Commit Graph

1171 Commits

Author SHA1 Message Date
Parker Moore
e5bcddfbe0 Merge pull request #2041 from anthonyjsmith/webrick_index_xml 2014-02-17 16:23:25 -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
fb8e562123 Merge pull request #2042 from anthonyjsmith/draft-path 2014-02-16 21:36:00 -05:00
Markus Roth
c47751148c Remove executable bits of non executable files. 2014-02-17 01:41:12 +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
Anthony Smith
86208d8c33 Add index.xml to WEBrick DirectoryIndex 
Resolves #2040
 2014-02-13 23:12:36 +00:00
Parker Moore
88e35f0852 Release 2.0.0.alpha.1 2014-02-13 18:02:49 -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
Parker Moore
83f5b4d93b Merge pull request #2031 from jekyll/utf8-heart 2014-02-13 12:53:58 -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
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
Parker Moore
1176fc6f57 Give File.join the strings from the array 2014-02-08 00:38:59 -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
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
Matt Rogers
5edb4c6bfd Merge pull request #1982 from dtao/safe-yaml-no-clobber 2014-01-31 06:48:16 -08:00
Parker Moore
baabe7eb7e DRY up code, props @tamouse 2014-01-30 22:03:10 -05:00
Matt Rogers
2b973468bf Merge pull request #1991 from jekyll/coffeescript 2014-01-30 18:39:40 -08:00
Aziz Shamim
509e2181de sync mime types to GitHub 2014-01-26 12:15:15 -06:00
Parker Moore
fdbfd719ca Add CoffeeScript converter. 2014-01-25 20:38:51 -05:00
John Firebaugh
4a769dbf5f Optimize Post#{next,previous} 
Use object equality for comparisons rather than Comparable#==,
which in turn uses Post#<=>, which is slow.

This yielded a 3x performance improvement for `jekyll build`
on a large site (1m6.467s -> 0m19.532s).
 2014-01-24 17:17:41 -08:00
Matt Rogers
5b7a53b543 Merge pull request #1932 from jekyll/sass 2014-01-24 15:18:06 -08:00
Parker Moore
c9a3c40f83 fixes based on @mattr-'s notes 2014-01-24 12:19:19 -05:00
Parker Moore
774bf96c61 Merge master into sass 2014-01-24 12:17:35 -05:00
Dan Tao
4f0b1bdf6d switched from YAML.safe_load* to SafeYAML.load* 2014-01-23 17:25:17 -08:00
Matt Rogers
98857832cd Merge pull request #1931 from liufengyun/published 2014-01-22 05:38:04 -08:00
Parker Moore
606c525099 Relative posts should never fail to build, even if @dir or @name is nil 
Fixes https://github.com/jekyll/jekyll/issues/1963
 2014-01-21 23:50:20 -05:00
liufengyun
22e1e5f28c make sure pages with published being false are not generated 2014-01-19 09:52:19 +08:00
Jens Nazarenus
4c140efba8 fix full path leak to source directory when using include tag 2014-01-15 21:36:35 +01:00
Ben Balter
e3be74e376 sanity check for pages permalink traversal 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Andy Lindeman
a8dd34420b Prevents disclosure of file existence 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
c84cb5c007 escape relative post permalinks, cleanup 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
a799e41b70 patch symlink vuln and properly test 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
323d14845f rebreak tests, move sanitization closer to write 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter
9b3068c15d url escape before sanitizing 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Parker Moore
4afe39e461 Allow caching in unsafe mode, but disable in safe mode. 2014-01-12 21:36:08 -08:00
Parker Moore
4784d1de18 Build Sass configuration options. 2014-01-12 21:30:30 -08:00
Parker Moore
22d4e2aa90 Consolidate into one master 'Sass' converter. 2014-01-12 21:30:29 -08:00
Parker Moore
daa0b76484 Allow users to specify options for Sass. 2014-01-12 21:30:29 -08:00
Parker Moore
4da7223831 Fixes for Sass/SCSS converters. 2014-01-12 21:30:29 -08:00