Commit Graph

4967 Commits

Author SHA1 Message Date
Parker Moore ac7f592839 Merge pull request #3161 from dnozay/patch-3 2014-11-28 21:32:23 -08:00
Parker Moore 4ccf9ea683 Update history to reflect merge of #3162 [ci skip] 2014-11-28 21:27:32 -08:00
Parker Moore 7de9433fbc Merge pull request #3162 from dnozay/patch-4 2014-11-28 21:27:07 -08:00
Parker Moore 9c8acdd3ea Update history to reflect merge of #3165 [ci skip] 2014-11-28 21:22:58 -08:00
Parker Moore e9904fd44b Merge pull request #3165 from fabschurt/fix-doc-typos 2014-11-28 21:22:32 -08:00
Damien Nozay ba9a309572 Update configuration.md
`keep_files` is a very useful option when using tools such as `grunt-build-control`, `grunt`, `gulp` or `yeoman`.
2014-11-28 21:09:08 -08:00
Fabien Schurter 75cf2d73f6 Fix erroneous 'next_section' value
According to /site/_data/docs.yml, the document next to
'deployment-methods' is 'continuous-integration', not 'troubleshooting'
(the 'prev_section' value in 'troubleshooting' is correctly set to
'deployment-methods' though).
2014-11-28 04:26:22 +01:00
Fabien Schurter 974fab6c9c Fix a typo
Replaced "capaibilities" with correct spelling: "capabilities".
2014-11-28 04:14:26 +01:00
Damien Nozay 5a554572e3 Update configuration.md
repeat warning about `destination` that is found in <http://jekyllrb.com/docs/usage/>
(see also pull request #3159)
2014-11-27 15:11:28 -08:00
Parker Moore 8603738a89 Update history to reflect merge of #3154 [ci skip] 2014-11-27 01:14:35 -08:00
Parker Moore 932cd3b575 Merge pull request #3154 from afeld/jsonify-bool 2014-11-27 01:14:04 -08:00
Parker Moore 588f21f5cd Compress SCSS when pushing to jekyllrb.com.
Fixes #3153.
Rel: #3145.
Since d26202936ebe0d14bcacc5dea9c40a1b4bb830f3.
2014-11-26 11:32:09 -08:00
Aidan Feldman 0662d31bf6 fix jsonify filter when used with boolean values 2014-11-26 02:40:41 -06:00
Matt Rogers a6f8b6c7d6 Update history to reflect merge of #3149 [ci skip] 2014-11-25 12:34:38 -06:00
Matt Rogers e51f94a038 Merge pull request #3149 from jekyll/document-build-serve-quiet-option 2014-11-25 12:34:34 -06:00
Parker Moore 1aa5c7a820 Update history to reflect merge of #3147 [ci skip] 2014-11-25 10:21:03 -08:00
Parker Moore 37af23b5d7 Merge pull request #3147 from blbradley/markdown-file-ext-regexp 2014-11-25 10:20:27 -08:00
Matt Rogers df87a51ade Expand the description for the `-q` option. 2014-11-25 08:40:37 -06:00
Ruslan Korolev 2a138e4ca9 jekyll build/serve -q option to docs 2014-11-25 08:21:08 -06:00
Brandon Bradley e546eb3e9f force markdown regexp to match the full extension 2014-11-24 20:08:31 -06:00
Brandon Bradley d250efccb9 add test for broken markdown regexp 2014-11-24 19:56:26 -06:00
Parker Moore e23a74aad9 Release 💎 2.5.2 2014-11-23 15:02:08 -08:00
Parker Moore 5b77d02e3b Merge pull request #3141 from jekyll/bundle-require-is-borking-pygments
Fix Bundler-integration Plugin Manager
2014-11-23 14:18:06 -08:00
Parker Moore c2b24e82e5 Refactor the case statement in highlighter for better readability. [ci skip] 2014-11-23 14:17:21 -08:00
Parker Moore 10030ae8cd Put that Bundle.require statement back. 2014-11-23 14:13:47 -08:00
Parker Moore ef53e677a4 Better tests for plugin manager. 2014-11-23 13:14:51 -08:00
Parker Moore 03d9396b85 Capture the output of Jekyll::Commands::New when looking for an error. 2014-11-23 12:53:36 -08:00
Parker Moore 665178d210 Merge pull request #3117 from jekyll/release-2-5-2 2014-11-23 12:39:58 -08:00
Parker Moore b1bba1945a Prepare for a v2.5.2 release. 2014-11-22 15:37:07 -08:00
Parker Moore 8ed6c7b077 Update history to reflect merge of #3119 [ci skip] 2014-11-22 14:27:06 -08:00
Parker Moore 9a94829bcb Merge pull request #3119 from jekyll/fix-bundle-require 2014-11-22 14:25:07 -08:00
Parker Moore d17b80bf2a Keep track of the required gems. 2014-11-22 12:38:36 -08:00
Parker Moore cb8a4b4d62 Update history to reflect merge of #3136 [ci skip] 2014-11-21 10:09:54 -08:00
Parker Moore a75ed0b33d Merge pull request #3136 from knorthfield/patch-1 2014-11-21 10:09:10 -08:00
Kris Northfield 58511822e6 Add remote-include plugin to list 2014-11-21 17:37:54 +00:00
Parker Moore 876253edce Add Slack build notifications. 2014-11-20 20:50:47 -08:00
Parker Moore 0f669ba9b1 Update history to reflect merge of #3132 [ci skip] 2014-11-20 12:37:27 -08:00
Parker Moore a9a21e6572 Merge pull request #3132 from XhmikosR/gridism 2014-11-20 12:37:06 -08:00
Parker Moore 3b05b0d867 Update history to reflect merge of #3133 [ci skip] 2014-11-20 12:36:33 -08:00
Parker Moore b16d47a444 Merge pull request #3133 from XhmikosR/patch-11 2014-11-20 12:36:08 -08:00
XhmikosR d2d3087d3b Slightly compress jekyll-sticker.jpg. 2014-11-20 22:18:02 +02:00
XhmikosR b9a4cf0485 Update gridism. 2014-11-20 22:11:50 +02:00
Parker Moore 848e402937 Update history to reflect merge of #2904 [ci skip] 2014-11-20 10:36:10 -08:00
Parker Moore c0951b0a19 Merge pull request #2904 from XhmikosR/mixins 2014-11-20 10:35:27 -08:00
Parker Moore 3592284969 Update history to reflect merge of #3127 [ci skip] 2014-11-18 12:50:28 -08:00
Parker Moore 0f458edf2b Merge pull request #3127 from aarongustafson/master 2014-11-18 12:50:07 -08:00
Aaron Gustafson 1adf8974bf Adding Webmentions in the right place this time :-) 2014-11-18 15:06:24 -05:00
XhmikosR da443039e1 Move custom code from _font-awesome.scss to _style.scss.
Also change the order of includes so that _style.scss is last for precedence reasons.
2014-11-18 08:15:53 +02:00
XhmikosR 4aee950418 Add Sass mixins and use them.
Reduces code duplication and makes things cleaner.
2014-11-18 08:15:53 +02:00
Parker Moore 9e454d24a0 Update history to reflect merge of #3123 [ci skip] 2014-11-17 13:06:29 -08:00