Commit Graph

2061 Commits

Author SHA1 Message Date
Jordon Bedwell b63712e403 Fix an edge where file is sometimes not returned properly. 2015-12-05 04:48:51 -06:00
Parker Moore c6255d5f28 Merge pull request #4223 from jekyll/pull/sample-filter
Merge pull request 4223
2015-12-04 14:12:18 -08:00
Parker Moore 47d2a2459d filters: refactor #sample to leave off the arg 2015-12-04 13:48:09 -08:00
Jordon Bedwell 8efbdc01ff Fix #3791/#3478
* Add support for SSL through command line switches.
* Add suppport for file/index.html > file.html > directory.
* Add support for custom-headers through configuration.
* Modernize and split up the serve.
* Add a few basic tests.
2015-12-04 14:07:07 -06:00
Parker Moore 2e91d094e5 filters#sample: n == 1, return item; n > 1, return array 2015-12-04 10:25:13 -08:00
Jordon Bedwell 28c568386d Merge pull request #4220 from jekyll/pull/enable-codeclimate-platform
Fix: #4219: Add CodeClimate Platform.
2015-12-04 12:08:00 -06:00
Jordon Bedwell b6de905ee4 Fix: #4219: Add CodeClimate Platform. 2015-12-04 11:42:52 -06:00
Parker Moore 86195655d7 filters: allow sample(n) instead of just sample(1) 2015-12-04 09:40:57 -08:00
Parker Moore 96bc62c666 Add 'sample' Liquid filter
Equivalent to Array#sample functionality
2015-12-04 09:33:33 -08:00
Parker Moore 6cbd06ea85 Merge pull request #4109 from jekyll/cleanup-kramdown-converter
Merge pull request 4109
2015-12-04 09:21:22 -08:00
Parker Moore fe13c3b366 KramdownConverter: clean up some source with some unified methods 2015-12-04 09:21:11 -08:00
Jordon Bedwell e331a37260 Fix #4202: Have Kramdown behave like Github. 2015-12-04 11:11:30 -06:00
Jordon Bedwell 3432fd2c2d Modernize Kramdown for Markdown converter. 2015-12-04 08:09:08 -06:00
Parker Moore b90f8e048a Merge pull request #4150 from ducktyper/master
Merge pull request 4150
2015-11-30 19:57:01 -08:00
Parker Moore 4890cecaf3 Merge pull request #4205 from jekyll/pull/fix-layout-vs-page-data
Merge pull request 4205
2015-11-30 19:55:36 -08:00
Parker Moore ac9fa413a5 Convertible should make layout data accessible via 'layout'
Not via 'page'. Erroneous!

Fixes #4117.
2015-11-30 14:35:55 -08:00
Jordon Bedwell c8edb15820 Prevent shell injection when opening a URL. 2015-11-29 21:22:27 -06:00
Parker Moore 64e87bfac9 Merge pull request #4144 from friedenberg/master
Merge pull request 4144
2015-11-28 23:21:30 -08:00
Sasha Friedenberg face3985dc add "-o" option to serve command which opens server URL 2015-11-28 15:13:44 -05:00
rebornix 657a8d7239 Allow users to input multiple variables in include tag 2015-11-25 16:37:08 +08:00
Parker Moore ac1b2b88d4 Merge pull request #4160 from jekyll/fix-html-htm-xhtml-pages
Merge pull request 4160
2015-11-24 16:19:46 -08:00
Sam Volin 35070d6806 added debug message to collection 2015-11-24 16:02:10 -07:00
Jordon Bedwell f7a2b52cd9 Merge pull request #4174 from gfxmonk/master
Fix #4173: Rename @options so that it does not impact Liquid.
2015-11-24 04:19:57 -06:00
Tim Cuthbertson a7730914df rename `@options` in HighlightBlock (clash with Liquid::Block). fixes #4173 2015-11-24 20:24:44 +11:00
rebornix 16aea22c8d pass build options into clean command 2015-11-23 22:38:45 +08:00
Jordon Bedwell 275aea11d1 Merge pull request #4168 from jekyll/pr/cleanup-url-sanitize
Slightly speed up url sanitization and handle multiples of ///.
2015-11-19 19:26:31 -06:00
Jordon Bedwell 487d9ffc21 Slightly speed up url sanitization and handle multiples of ///. 2015-11-19 18:46:03 -06:00
ducksan cho e9f8b4df74 Add Windows support to Utils.safe_glob 2015-11-19 17:15:51 +13:00
Jordon Bedwell 90865d5fc1 Fix #4082: Allow users to use .htm and .xhtml (XHTML5.) 2015-11-18 16:02:03 -06:00
Parker Moore c1761bc478 Merge pull request #4120 from rebornix/CacheIncludeTemplate
Merge pull request 4120
2015-11-18 11:53:10 -08:00
Ducksan Cho 20735e12f9 Use safe_glob to unsafe glob 2015-11-19 01:02:48 +13:00
Ducksan Cho a168edae45 Add Utils.safe_glob method
which works the same way as Dir.glob but seperating the input
into two parts ('dir' + '/' + 'pattern') to make sure
the first part('dir') does not act as a pattern.
2015-11-19 00:46:46 +13:00
Parker Moore 2b4a3c008d Release 💎 3.0.1 2015-11-17 22:19:45 -08:00
rebornix 6a98ab2a15 Make `:title` cased for backwards compability and add `:slug` for uncased usage. 2015-11-18 10:43:13 +08:00
Ducksan Cho bd2c337e5b Avoid using Dir.glob with absolute path
the absolute path including '[', '{', '?', or '*'
could change the outcome
2015-11-18 02:18:25 +13:00
Larry Fox 246ff3f9b6 Remove Post autoload
Seems like this got missed. Referencing `Jekyll::Post` results in a `LoadError`
2015-11-11 11:55:54 -05:00
rebornix 87a8695196 Cache include file to save liquid parsing time. 2015-11-10 21:08:37 +08:00
chrisfinazzo d1cbea8a37 Fix the deprecation warning in the doctor command 2015-11-06 09:48:42 -05:00
Parker Moore db6103bdee Document: only superdirectories of the collection are categories 2015-11-04 15:18:02 +07:00
Parker Moore bbc2b66a84 Merge pull request #4104 from willnorris/fix-hooks
Merge pull request 4104
2015-11-04 07:13:16 +07:00
Will Norris 1bfe5a6f95 align hooks documentation and implementation
- add site post_render hook, which was documented but wasn't being
  called
- define documents post_init hook, which was documented but caused an
  error when called (fixes #4102)
- add docs for site post_read hook, which was being called but wasn't
  documented
- fix container name in example: s/post/posts/
2015-11-03 07:47:32 -08:00
Paul Robert Lloyd e5279d4773 Santize @config['highlighter'] to only allow highlighters supported by kramdown 2015-11-01 23:04:59 +00:00
Paul Robert Lloyd 9d1641f163 Fix #3371 - kramdown:syntax_highlighter should automatically take value of highlighter 2015-10-31 23:58:49 +00:00
Parker Moore 48b23858ad Merge pull request #4079 from jekyll/fix-jekyll-metdata-being-generated-on-non-incremental
Merge pull request 4079
2015-10-31 03:40:32 +08:00
Jordon Bedwell 0f4aed9ccf Fix #4066: Move Convertible#render_liquid to using render! 2015-10-29 16:06:17 -05:00
Jordon Bedwell 71f4383d18 Fix #4075: Make sure that .jekyll-metadata is not generated when not needed. 2015-10-29 15:44:38 -05:00
Jordon Bedwell e5f26b5a36 Fix test warnings when doing rake {test,spec} or script/test 2015-10-29 15:18:19 -05:00
Parker Moore 5082e144d8 Release 💎 3.0.0.pre.rc1 2015-10-26 20:22:53 -07:00
Parker Moore 7b81f00137 Defaults: compare paths in applies_path? as Strings to avoid confusion
/cc #4064
2015-10-26 17:28:20 -07:00
Parker Moore 45f69bb8cd Utils: deep_merge_hashes should also merge default_proc
If the target hash's default_proc isn't set, overwrite with the new hash's default_proc.

/cc #4064
2015-10-26 17:27:36 -07:00