Commit Graph

8698 Commits

Author SHA1 Message Date
Pat Hawks 0f2013114c
Merge branch 'master' into jekyll-utils-exec 2017-01-06 05:42:15 -06:00
jekyllbot 08cec6889a Update history to reflect merge of #5720 [ci skip] 2017-01-06 02:14:53 -08:00
jekyllbot 6050b3566e Merge pull request #5720 from oakstudios/add-unpublished-to-docs
Merge pull request 5720
2017-01-06 02:14:52 -08:00
jekyllbot 91776d1dc7 Update history to reflect merge of #5688 [ci skip] 2017-01-06 01:56:29 -08:00
jekyllbot b774147fe9 Merge pull request #5688 from muratayusuke/feature/jekyll-numbered-headings
Merge pull request 5688
2017-01-06 01:56:28 -08:00
Ashwin Maroli ea9c303c95 Merge branch 'master' of https://github.com/jekyll/jekyll into url-slash 2017-01-06 12:02:34 +05:30
muratayusuke 657e502a72 Add jekyll-numbered-headings 2017-01-06 15:30:36 +09:00
Pat Hawks 1e4b779ab3
Escape # 2017-01-05 18:34:44 -06:00
Pat Hawks 5652c10305
Try to replace `URI.escape` with Addressable 2017-01-05 18:01:00 -06:00
Pat Hawks 6fb05e0799
Use Addressable instead of URI to decode 2017-01-05 17:44:54 -06:00
Pat Hawks 4b51c1da58
Use `assert_nil` 2017-01-05 17:08:04 -06:00
Skylar Challand be12be3411 Add undocumented --unpublished build option
via 57fd5f887d/lib/jekyll/command.rb (L63-L64)
2017-01-05 15:04:42 -05:00
jekyllbot 7cded91a7c Update history to reflect merge of #5713 [ci skip] 2017-01-03 00:30:54 -08:00
jekyllbot 8c01ff5fca Merge pull request #5713 from jekyll/bump-license
Merge pull request 5713
2017-01-03 00:30:52 -08:00
Frank Taillandier 9fb6355264 bump year
- Adding Jekyll contributors, following @benbalter advice.
2017-01-02 23:14:27 +01:00
jekyllbot fb75f4031c Update history to reflect merge of #5693 [ci skip] 2017-01-02 08:59:24 -08:00
jekyllbot da2899198d Merge pull request #5693 from tomjohnson1492/patch-7
Merge pull request 5693
2017-01-02 08:59:22 -08:00
Frank Taillandier a44a1eff92 Merge branch 'master' into patch-7 2017-01-02 17:46:14 +01:00
jekyllbot 7dce4e4270 Update history to reflect merge of #5712 [ci skip] 2017-01-02 08:17:08 -08:00
jekyllbot 5b995425bb Merge pull request #5712 from yous/theme-license
Merge pull request 5712
2017-01-02 08:17:06 -08:00
Chayoung You de6d62b2e3
Use the current year for the LICENSE of theme 2017-01-02 22:29:25 +09:00
jekyllbot 6ab6de7093 Update history to reflect merge of #5711 [ci skip] 2017-01-01 21:24:28 -08:00
jekyllbot b75d3a8783 Merge pull request #5711 from Ch4s3/master
Merge pull request 5711
2017-01-01 21:24:27 -08:00
Chase da1a36eff9 update Classifier-Reborn to 2.1.0 2017-01-01 18:20:45 -05:00
jekyllbot b704df0245 Update history to reflect merge of #5683 [ci skip] 2017-01-01 06:51:40 -08:00
jekyllbot 0d62e7fb41 Merge pull request #5683 from Nursen/patch-1
Merge pull request 5683
2017-01-01 06:51:38 -08:00
jekyllbot 0197b65e71 Update history to reflect merge of #5705 [ci skip] 2016-12-31 13:44:17 -08:00
jekyllbot d45ea7f493 Merge pull request #5705 from robcrocombe/robcrocombe-patch-1
Merge pull request 5705
2016-12-31 13:44:16 -08:00
jekyllbot 0014b1d9f0 Update history to reflect merge of #5689 [ci skip] 2016-12-29 19:02:54 -08:00
jekyllbot 817c9f6605 Merge pull request #5689 from tomjohnson1492/patch-3
Merge pull request 5689
2016-12-29 19:02:53 -08:00
Tom Johnson c8ef313d03 fixing sentence in dispute 2016-12-29 09:31:30 -08:00
Tom Johnson 192e79ed1e reset permalinks to same state it was in in patch-3 branch. i couldn't seem to remove it from the previous commit. 2016-12-29 08:57:39 -08:00
Tom Johnson 57d6d5986f update quickstart.md
I must have just updated the wrong doc or branch in the last commit. i hope this fixes it.
2016-12-29 08:27:42 -08:00
Frank Taillandier 685a142a83 Rebase patch 10 on patch 11 2016-12-29 11:58:57 +01:00
Tom Johnson acff6cd269 Removed erroneous liquid code, added back spacing
- removed erroneous liquid code with conditional include parameters
- added back spacing in {{ }} tags
2016-12-29 11:55:22 +01:00
Tom Johnson 56a7038a7e Updated to remove spacing from include variables
It turns out Liquid throws an error when you write `{% if {{ include.url }} %}` instead of `{% if {{include.url}} %}`. I updated the examples here to omit the spacing. To avoid inconsistency, I just omitted the spacing from all curly braces. Also added a note explaining the issue and put the blame on Liquid.
2016-12-29 11:55:22 +01:00
Tom Johnson 8289b61316 made requested updates
- made `{{ }}` formatting more readable by adding spacing. 
- added formatting to code samples to properly reflect line breaks for readability
2016-12-29 11:55:22 +01:00
Tom Johnson 240ea13576 Added new includes.md topic to docs
Added new includes.md topic.

See https://github.com/jekyll/jekyll/pull/5630 for more details on the update. 

@jekyll/documentation
@DirtyF
2016-12-29 11:55:22 +01:00
Rob Crocombe 6a2c7f2718 Add Jekyll-Post to plugins.md 2016-12-29 10:20:15 +00:00
Tom Johnson caf5c00842 made requested updates 2016-12-29 00:29:45 -08:00
Tom Johnson 90da02b1fc made updates from Parkr's review
- most prominent update is example of how to override minima default
2016-12-29 00:15:52 -08:00
Tom Johnson 391bf5d33c made fixes
made requested fixes
2016-12-28 23:46:25 -08:00
Tom Johnson b1b0d00c5a made updates
- made updates from Parkr's review
- update to Extensionless permalinks section
- update to note about not using built-in perm styles in front matter
- update for readability in places
2016-12-28 23:42:37 -08:00
Tom Johnson 2c8b826460 made requested change
**includes** --> *includes*
2016-12-28 23:00:06 -08:00
Parker Moore 02056f7b15 Merge pull request #5679 from jekyll/liquid-4-utils
[liquid 4] Utils
2016-12-28 21:55:55 -08:00
Parker Moore 1bc82b9c8a
Fix script/stackprof & add some GC stats.
When running 'script/stackprof object', I noticed that it would be helpful to see
GC information. It appears we create a lot of junk -- a source of optimization if
we decide to go down that path.

An average Jekyll build doesn't run a GC, but auto-regeneration likely would eventually
require a GC run and it would be interesting to see if we can reduce how much we throw
away with each call to 'site.process'.
2016-12-28 22:54:37 -07:00
Tom Johnson adc619ca6c added info about jekyll new --help 2016-12-28 15:21:57 -08:00
Tom Johnson c317161942 fixed space 2016-12-28 08:15:20 -08:00
Tom Johnson 56ae6ed571 Removed erroneous liquid code, added back spacing
- removed erroneous liquid code with conditional include parameters
- added back spacing in {{ }} tags
2016-12-27 21:39:56 -08:00
Tom Johnson f18363ea13 Updated to remove spacing from include variables
It turns out Liquid throws an error when you write `{% if {{ include.url }} %}` instead of `{% if {{include.url}} %}`. I updated the examples here to omit the spacing. To avoid inconsistency, I just omitted the spacing from all curly braces. Also added a note explaining the issue and put the blame on Liquid.
2016-12-27 11:03:23 -08:00