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
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
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
Parker Moore
824a84ef2a
Add support for Sass and SCSS.
2014-01-12 21:30:29 -08:00
Matt Rogers
6f394e82b5
Rename read_things to read_content.
2014-01-11 15:29:22 -06:00
Matt Rogers
d96165e3c4
Merge pull request #1916 from jekyll/gitignore-excludes
2014-01-11 10:37:31 -08:00
Parker Moore
5a52986db0
Use 'Forwardable' module to pass along some attribute calls to @post
2014-01-10 22:54:06 -08:00
Parker Moore
331c7adc08
Move #glob_include? from core_ext to entry_filter
2014-01-08 20:24:21 -08:00
Parker Moore
3d67cdc150
Cast to string before duplicating.
2014-01-05 11:02:03 -08:00
Parker Moore
35868807c1
Ensure leading slashes in path matching.
2014-01-05 10:54:52 -08:00
Parker Moore
42fc5e9ee7
Excludes should be relative to the site source
2014-01-05 10:45:42 -08:00
Matt Rogers
883e16acde
Merge pull request #1910 from pborreli/typos
2014-01-04 08:12:20 -08:00
Matt Rogers
a33e86630d
Merge pull request #1899 from soimort/preview-404
2014-01-04 08:04:20 -08:00
Pascal Borreli
bdda3a8ef6
Fixed typos
2014-01-04 14:17:38 +00:00
Parker Moore
6ca731c13b
Use idiomatic #is_a? method instead of #class ==
2014-01-03 21:23:02 -08:00
Ben Balter
39e4d6b3ba
add where filter to filter arrays of objects
2014-01-03 21:23:02 -08:00
Mort Yao
99b36c7c30
Routing 404 errors to custom 404 page for development server
2014-01-03 03:23:46 +01:00
Ahmed Hazem
fdcf1f4526
Add --quiet flag
2014-01-01 18:50:27 +02:00
Matt Rogers
012387396a
Merge pull request #1859 from robin850/rouge
2013-12-30 22:45:07 -06:00
Matt Rogers
a2fd8ba7c3
Merge pull request #1849 from afeld/sort-attributes
2013-12-30 20:31:45 -08:00
Parker Moore
791c6d815d
Merge pull request #1825 from arika/smallfix_post_url_tag_behavior_for_invalid_names
2013-12-25 22:32:50 -08:00
Parker Moore
1a3a607fcf
Merge pull request #1831 from jekyll/default-maruku-fenced-code-blocks
2013-12-25 22:14:23 -08:00
Parker Moore
6e8f31f406
Merge pull request #1841 from jens-na/include-variable-liquid-filters
2013-12-25 22:11:33 -08:00
Parker Moore
ebaa484294
Merge pull request #1866 from colindean/patch-2
2013-12-25 22:06:34 -08:00
Parker Moore
ab95cca434
Add TomDoc for Jekyll::Converters::Markdown#allowed_custom_class?
2013-12-26 00:33:34 -05:00
Parker Moore
7b9984699c
Fix error in exception message in Markdown Converter [ci skip]
2013-12-26 00:14:24 -05:00
Parker Moore
60b43104ee
Extract checks for acceptable custom markdown processors to method.
...
We should probably write more about what it does and how it works in a TomDoc block above.
@envygeeks, want to give that a shot?
2013-12-26 00:02:56 -05:00
Jordon Bedwell
a206dc1a8f
Use downcase.
2013-12-25 23:55:20 -05:00
Parker Moore
c70350e275
Merge branch 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll into gjtorikian-steal-envygeeks-custom-markdown-processors
...
* 'steal-envygeeks-custom-markdown-processors' of git://github.com/gjtorikian/jekyll:
Depend on Jekyll.logger.error, not $stderr
Allow custom Markdown processors.
New is implied by `raise`, 2nd is the message.
Use $stderr, not STDERR, $stderr points to STDERR.
2013-12-25 23:52:50 -05:00