Commit Graph

6247 Commits

Author SHA1 Message Date
Jordon Bedwell 915d8adb1b [CI:SKIP] Update Gemnasium URL. 2015-12-07 11:37:37 -06:00
Jordon Bedwell fdf12efde4 [CI:SKIP] Update history.markdown to reflect the merger of #4228 2015-12-05 04:54:34 -06:00
Jordon Bedwell 68d58f4183 Merge pull request #4228 from jekyll/pull/fix-file-edge-servlet
Fix an edge where file is sometimes not returned properly.
2015-12-05 04:53:47 -06:00
Jordon Bedwell b63712e403 Fix an edge where file is sometimes not returned properly. 2015-12-05 04:48:51 -06:00
Parker Moore 79ceb4d394 Update history to reflect merge of #4223
[ci skip]
2015-12-04 14:12:59 -08: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
Parker Moore dd971a3581 Update history to reflect merge of #4224
[ci skip]
2015-12-04 13:16:40 -08:00
Parker Moore 313582f06d Merge pull request #4224 from jekyll/pull/cleanup-and-modernize-serve-cmd
Merge pull request 4224
2015-12-04 13:16:13 -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 a43d2907c7 travis: fast finish. don't wait for allowed failures to finish. JRUBY... 2015-12-04 10:48:25 -08:00
Parker Moore 2e91d094e5 filters#sample: n == 1, return item; n > 1, return array 2015-12-04 10:25:13 -08:00
Jordon Bedwell d10dc01290 Update History.markdown 2015-12-04 12:09:06 -06: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
Parker Moore 0aa3c96d11 travis: do NOT wait for branch builds for PR's. it just wastes time. 2015-12-04 09:59:00 -08: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 b78d5085f1 Update history to reflect merge of #4109
[ci skip]
2015-12-04 09:21:43 -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 a5be27b222 Update history to reflect merge of #4121
[ci skip]
2015-12-02 11:51:37 -08:00
Parker Moore a4d918d328 Merge pull request #4121 from rebornix/FixDocsCSSBreak
Merge pull request 4121
2015-12-02 11:50:33 -08:00
Parker Moore 15fdc82821 Update history to reflect merge of #4210
[ci skip]
2015-12-02 10:51:04 -08:00
Parker Moore 0f23f69048 Merge pull request #4210 from DavidBurela/patch-1
Merge pull request 4210
2015-12-02 10:50:21 -08:00
David Burela e5e5369cde Update windows.md
Added a very quick guide on getting Jekyll up and running on Windows in the fastest way possible with just a few command prompt commands.
2015-12-02 15:23:11 +08:00
Parker Moore c7eacbdfcd Update history to reflect merge of #4150
[ci skip]
2015-11-30 19:58:16 -08: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 928f51ad24 Update history to reflect merge of #4205
[ci skip]
2015-11-30 19:56:08 -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
rebornix 47081736ef Update CSS to avoid it overlaps parent div 2015-11-30 13:16:20 +08:00
Jordon Bedwell d100a68563 Update History.markdown 2015-11-29 21:42:31 -06:00
Jordon Bedwell 9ff614c2f8 Merge pull request #4200 from jekyll/pull/prevent-shell-injection
Prevent shell injection when opening a URL.
2015-11-29 21:41:39 -06:00
Jordon Bedwell c8edb15820 Prevent shell injection when opening a URL. 2015-11-29 21:22:27 -06:00
Parker Moore 2a4aa0fdb1 Update history to reflect merge of #4190
[ci skip]
2015-11-28 23:25:34 -08:00
Parker Moore d2ea28d122 Merge pull request #4190 from nielsenramon/nr-add-kickster
Merge pull request 4190
2015-11-28 23:25:23 -08:00
Parker Moore 3e8f00a069 Update history to reflect merge of #4144
[ci skip]
2015-11-28 23:22:10 -08: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
Nielsen Ramon 147a29302f Add Kickster to deployment methods in documentation 2015-11-26 22:54:00 +01:00
Parker Moore 918bfd5fe5 Update history to reflect merge of #4183
[ci skip]
2015-11-25 10:28:07 -08:00
Parker Moore 4359dba84a Merge pull request #4183 from rebornix/MultiVariableInclude
Merge pull request 4183
2015-11-25 10:27:36 -08:00
rebornix 657a8d7239 Allow users to input multiple variables in include tag 2015-11-25 16:37:08 +08:00
Jordon Bedwell effe23a008 Update history.markdown to reflect the merger of #4154 2015-11-24 20:50:09 -06:00
Jordon Bedwell c227530300 Merge pull request #4154 from napcae/patch-1
Update Plugin Docs
2015-11-24 20:49:11 -06:00
Chi Trung Nguyen 43cfad250e Update Plugin Docs
according to #4126
2015-11-25 02:51:13 +01:00
Parker Moore 7a284b802b Update history to reflect merge of #4181
[ci skip]
2015-11-24 17:33:33 -08:00