dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,207 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

3207 Commits

Author SHA1 Message Date
Matt Rogers 3b485b4497 Lock Maruku to 0.7.0 
This fixes the errors we see in our tests due to the upgrade to Maruku
0.7.1
 2014-01-15 23:11:27 -06:00
Matt Rogers 10e5ecfe53 Improve the test description for the outputs_ext test 2014-01-15 23:04:52 -06:00
Matt Rogers 824d9f6ca8 Better express that the converter always outputs css 2014-01-15 22:49:33 -06:00
Matt Rogers 0be62fa2e0 Update history to reflect merge of #1947 2014-01-15 22:13:37 -06:00
Matt Rogers 5dc4c67344 Merge pull request #1947 from jekyll/1-4-3-release-info 2014-01-15 20:13:31 -08:00
Jens Nazarenus 4c140efba8 fix full path leak to source directory when using include tag 2014-01-15 21:36:35 +01:00
Troy Swanson 7f3b35191c Make doc menus more reusable 2014-01-14 21:48:08 -06:00
Parker Moore ea94e5dd1c Update history to reflect merge of #1949 [ci skip] 2014-01-14 08:56:28 -08:00
Parker Moore b3064a9b7d Forgot #1943 in the line, whoopsie 2014-01-14 08:44:20 -08:00
Parker Moore dc599121a0 Update history to reflect merge of #1943 [ci skip] 2014-01-14 08:43:53 -08:00
Parker Moore 45c0523e55 update dat gemspec 2014-01-14 08:43:29 -08:00
Parker Moore 245597c2db Require Liquid 2.5.5 <= x < 2.6 2014-01-13 22:28:16 -08:00
Parker Moore e87cd8d53c Update History.markdown with 1.4.3 release. 2014-01-13 22:27:41 -08:00
Parker Moore edc9ffcb65 Add 1.4.3 release post by @BenBalter for master branch. 2014-01-13 22:26:38 -08: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 4e318cd192 test symlinkd dir, not file 
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 ce425eec8b fix symlink so tests fail 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter f570a9339d unbreak tests 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter dfec551cc4 add symlink failing test 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter 0acbe95797 test multiple traversals 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Ben Balter f49ee21136 fix failing post count test 
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
Ben Balter 9e796d0627 failing test 
Signed-off-by: Parker Moore <parkrmoore@gmail.com>
 2014-01-13 22:21:30 -08:00
Matt Rogers 750a56d1fe Update history to reflect merge of #1940 2014-01-13 13:13:31 -06:00
Matt Rogers 15ea6eecf9 Merge pull request #1940 from robatron/patch-1 2014-01-13 11:13:28 -08:00
Rob McGuire-Dale 5aeb2733a1 Add link to contributors in README. 
Linkify "awesome contributors" in the README, as in the footer of the [Jekyll home page](http://jekyllrb.com/).
 2014-01-13 10:19:05 -08:00
Matt Rogers 2c2beb9c1f Update history to reflect merge of #1938 2014-01-13 09:16:29 -06:00
Matt Rogers f9263b6fdf Merge pull request #1938 from jekyll/excludes-relative-to-site-source-docs 2014-01-13 07:15:53 -08:00
Parker Moore 2966606b1a Add docs about the 'new' restriction on excludes. 2014-01-13 00:17:12 -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 6b92126fd8 Add docs for Sass conversion. 2014-01-12 21:30:30 -08:00
Parker Moore 66732b91c1 Make sass a runtime dependency. 2014-01-12 21:30:30 -08:00
Parker Moore ecf85a9cfa Does not allow caching. 
This was done to prevent putting the .sass-cache folder in bad places. Needed? cc @benbalter.
 2014-01-12 21:30:30 -08:00
Parker Moore 8ecd2d9218 Don't allow path traversal or syntax overrides. 2014-01-12 21:30:30 -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
Parker Moore 824a84ef2a Add support for Sass and SCSS. 2014-01-12 21:30:29 -08:00
Parker Moore 0d6db1613f Update history to reflect merge of #1936 [ci skip] 2014-01-12 21:30:18 -08:00
Parker Moore f23952c8ab Merge pull request #1936 from jekyll/branding 2014-01-12 21:29:51 -08:00
Parker Moore 21cef96b5d Branding, baby. 
Many thanks to http://patorjk.com/software/taag/ for doing the
ASCII art. 😃
 2014-01-12 14:44:40 -08:00
Parker Moore f8c904908a Update history to reflect merge of #1933. 
[ci skip]
 2014-01-12 13:53:56 -08:00
Rob Muhlestein b053a1edf1 Add note in Posts docs about stripping <p> tags from excerpt. 
Fixes #1926. Merges #1933.
 2014-01-12 13:52:32 -08:00
Ben Balter e5f1a400ee first pass at vision 2014-01-12 11:57:11 -08:00
Parker Moore 8bc51fdb5c Update history to reflect merge of #1928 [ci skip] 2014-01-11 15:32:12 -08:00