Commit Graph

6523 Commits

Author SHA1 Message Date
jekyllbot 735554007c Merge pull request #4314 from jekyll/allow-custom-php-extensions
Merge pull request 4314
2016-01-09 18:11:47 -08:00
Parker Moore bb4f5910c9 document: don't cache @output_ext
Fixes race issue.
Will introduce perf issues, though...
2016-01-09 18:04:13 -08:00
jekyllbot e558d0b983 Update history to reflect merge of #4333 [ci skip] 2016-01-09 16:58:09 -08:00
jekyllbot 53e4c162a2 Merge pull request #4333 from pathawks/smartypants
Merge pull request 4333
2016-01-09 16:58:09 -08:00
Pat Hawks 428e4fe3b5
Add documentation for smartify Liquid filter 2016-01-09 16:46:27 -08:00
jekyllbot 390503b2c7 Update history to reflect merge of #4323 [ci skip] 2016-01-09 16:19:43 -08:00
jekyllbot 15eaefa337 Merge pull request #4323 from pathawks/smartypants
Merge pull request 4323
2016-01-09 16:19:43 -08:00
Pat Hawks ddf640e6bd
Test all the things 2016-01-08 17:10:36 -08:00
Parker Moore bd325acc85 Remove duplicate reference for #4330 from History. [ci skip] 2016-01-07 23:26:03 -08:00
jekyllbot 6996fed26c Update history to reflect merge of #4330 [ci skip] 2016-01-07 23:24:29 -08:00
jekyllbot bfc07a39c6 Update history to reflect merge of #4330 [ci skip] 2016-01-07 23:22:07 -08:00
Parker Moore 97a6a312ac Revert "Update history to reflect merge of #4330 [ci skip]"
This reverts commit a12ee55139.
2016-01-07 22:27:47 -08:00
jekyllbot a12ee55139 Update history to reflect merge of #4330 [ci skip] 2016-01-07 22:26:41 -08:00
jekyllbot ade8a0107f Merge pull request #4330 from motlin/patch-2
Merge pull request 4330
2016-01-07 22:15:37 -08:00
Craig P. Motlin 754bf14e23 Fix grammar in the documentation for posts. 2016-01-08 00:14:33 -05:00
Jordon Bedwell 0c4969f017 Merge pull request #4329 from motlin/patch-1
Fix a typo in the documentation for configuration defaults.
2016-01-07 22:28:25 -06:00
Craig P. Motlin 3ca451a855 Fix a typo in the documentation for configuration defaults. 2016-01-07 23:23:43 -05:00
Parker Moore ab2cdac979 Update history to reflect merge of #4318
[ci skip]
2016-01-07 18:29:11 -08:00
jekyllbot a5fbc25d8c Merge pull request #4318 from jekyll/pull/cleanup-gemfile
Merge pull request 4318
2016-01-07 18:13:54 -08:00
Jordon Bedwell 50086b686a Merge pull request #4319 from jekyll/pull/remove-rake-analysis
Remove rake analysis, use bundle exec rubocop now.
2016-01-07 07:38:19 -06:00
Pat Hawks acb2263f51
Add smartify filter 2016-01-07 02:36:24 -08:00
Parker Moore 7eefa0ffd7 docs: remove profanity from installation page
Fixes #4321
2016-01-06 11:12:55 -08:00
Parker Moore a1b39840bb Revert change to Collection#url_template which caused test breakage.
Reverts dab53a697b
2016-01-06 10:13:13 -08:00
Parker Moore 3061f2d204 Update history to reflect merge of #4322
[ci skip]
2016-01-06 09:51:10 -08:00
Parker Moore c9d667594f Merge pull request #4322 from splattael/fix-spelling
Merge pull request 4322
2016-01-06 09:48:58 -08:00
Peter Suschlik b1a2115948 Fix spelling of GitHub in docs and history
* Github -> GitHub
* GitHub pages -> GitHub Pages
2016-01-06 17:21:09 +01:00
Jordon Bedwell a48c02a889 Reorganize and cleanup the Gemfile, shorten depends on Travis. 2016-01-05 12:36:40 -06:00
Jordon Bedwell 4cde2ad41c Remove rake analysis, use bundle exec rubocop now. 2016-01-05 12:30:23 -06:00
Parker Moore 8e68de2740 site: redirect /docs/ to /docs/home/ 2016-01-04 18:22:55 -08:00
Parker Moore dc31264160 url: tiny optimization to #generate_url_from_drop 2016-01-04 18:18:28 -08:00
Parker Moore 9579924f8a drop: tiny optimization to .mutable to create fewer objects 2016-01-04 18:18:12 -08:00
Parker Moore dab53a697b collection: tiny optimization to #url_template 2016-01-04 18:17:51 -08:00
Parker Moore b6c283a4ae wip: allow custom extensions 2016-01-04 17:42:06 -08:00
Parker Moore 935e5563e1 Update history to reflect merge of #4254
[ci skip]
2016-01-04 16:31:06 -08:00
Parker Moore f995d86673 Merge pull request #4254 from jekyll/shim-docs-import-with-nudge
Merge pull request 4254
2016-01-04 16:30:30 -08:00
Parker Moore 657b6b328c Update history to reflect merge of #4307
[ci skip]
2016-01-04 16:26:02 -08:00
Parker Moore f47612ee98 Merge pull request #4307 from fulldecent/patch-1
Merge pull request 4307
2016-01-04 16:25:41 -08:00
Parker Moore a9b80b2f06 features/layout_data: add scenario for inheriting layout data from child to parent
Ref: https://github.com/jekyll/jekyll/pull/4312#discussion_r48781985
2016-01-04 16:21:53 -08:00
Parker Moore d37de5c8df If the subcommand cannot be found, suggest the installation of a gem. 2016-01-04 16:17:48 -08:00
Parker Moore 4fe9eecf05 For blessed gems, shim their commands so users know how to use them. 2016-01-04 16:10:21 -08:00
Parker Moore 10a1b9451a Update history to reflect merge of #4290
[ci skip]
2016-01-04 14:57:59 -08:00
Parker Moore a78230ccdb Merge pull request #4290 from jekyll/deal-with-extraneous-spaces
Merge pull request 4290
2016-01-04 14:57:22 -08:00
Parker Moore cb5bc1093e utils: has_yaml_header? should accept files with extraneous spaces
Occasionally, extra spaces at the end of the YAML front matter prologue are
saved to a file and it goes missing without telling the user why. This
should simply accept those changes without any detriment to the user,
allowing anyone to add as many spaces as they like to the end of their
front matter prologues.
2016-01-04 14:09:30 -08:00
Parker Moore 1ea667474b Clean up the permalink front matter protip
Ref #4296.
2016-01-04 13:24:14 -08:00
Parker Moore ed815b0d2c Update history to reflect merge of #4296
[ci skip]
2016-01-04 13:07:33 -08:00
Parker Moore c603be6a38 Merge pull request #4296 from kakoma/master
Merge pull request 4296
2016-01-04 13:07:12 -08:00
Parker Moore ee2db21202 Update history to reflect merge of #4312
[ci skip]
2016-01-04 13:05:19 -08:00
Parker Moore e097a15657 Merge pull request #4312 from jekyll/fix-layout-metadata
Merge pull request 4312
2016-01-04 13:05:00 -08:00
Parker Moore a62e085ea0 Update history to reflect merge of #4311
[ci skip]
2016-01-04 13:04:38 -08:00
Parker Moore 378ec5a4b8 Merge pull request #4311 from jekyll/use-drop-hash-accessor
Merge pull request 4311
2016-01-04 13:04:14 -08:00