685a142a83
Rebase patch 10 on patch 11
2016-12-29 11:58:57 +01:00
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
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
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
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
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
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
488ec5489c
moved includes to appear after templates
...
made update based on review. moved includes topic after templates in nav list.
2016-12-26 18:36:39 -08:00
31de9ea484
made requested updates
...
- made `{{ }}` formatting more readable by adding spacing.
- added formatting to code samples to properly reflect line breaks for readability
2016-12-26 18:28:27 -08:00
503420a9b4
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-25 20:44:35 -08:00
2d0df85b93
Add includes link to doc nav
...
I created more advanced details about includes and created a new page for it instead of putting all the info on the templates page.
See https://github.com/jekyll/jekyll/pull/5630 for more details on the update.
@jekyll/documentation
@DirtyF
2016-12-25 20:42:16 -08:00
52c2645abb
Update history to reflect merge of #5671 [ci skip]
2016-12-20 02:15:57 -08:00
f4d1176199
Merge pull request #5671 from DirtyF/rubocop-gemfile
...
Merge pull request 5671
2016-12-20 02:15:56 -08:00
6eca7e101a
Update history to reflect merge of #5670 [ci skip]
2016-12-20 00:38:18 -08:00
4d9e4a9bd8
Merge pull request #5670 from DirtyF/bump-rake
...
Merge pull request 5670
2016-12-20 00:38:17 -08:00
00f2fe3abc
fix typo
2016-12-20 09:27:44 +01:00
8a0d44eedc
please Rubocop 🤖
...
- Reorder gems
- use double quotes
2016-12-19 23:50:16 +01:00
f09e1b15d8
bump to rake 12.0
2016-12-19 23:42:30 +01:00
79adb49676
Update history to reflect merge of #5668 [ci skip]
2016-12-19 12:40:10 -08:00
85d89c3f03
Merge pull request #5668 from kainjow/patch-1
...
Merge pull request 5668
2016-12-19 12:40:09 -08:00
2fc800ebd2
Use each instead of map to actually return nothing
2016-12-18 17:32:19 -08:00
53db36c43a
Update history to reflect merge of #5666 [ci skip]
2016-12-18 02:02:42 -08:00
7231088e5c
Merge pull request #5666 from DirtyF/rubocop-jekyll
...
Merge pull request 5666
2016-12-18 02:02:41 -08:00
48f7a155c3
reindent attributes
2016-12-18 08:55:05 +01:00
d134afcd4a
ran rubocop -a
2016-12-18 07:22:36 +01:00
de56b977b6
ran rubocop -a
...
#5665
2016-12-18 07:22:11 +01:00
38a50e49de
Update history to reflect merge of #5655 [ci skip]
2016-12-17 21:59:26 -08:00
e21d35a474
Merge pull request #5655 from ashmaroli/fontawesome-docs
...
Merge pull request 5655
2016-12-17 21:59:25 -08:00
109dceee3d
move changes to /.github/ and regenerate site
2016-12-18 07:45:08 +05:30
25f58fe8f8
Update history to reflect merge of #5658 [ci skip]
2016-12-13 23:47:28 -08:00
f560a4e226
Merge pull request #5658 from idmit/patch-1
...
Merge pull request 5658
2016-12-13 23:47:27 -08:00
96fee68da4
Fix a couple of typos in the docs
2016-12-14 02:11:49 +03:00
2856fd3ac7
Update history to reflect merge of #5657 [ci skip]
2016-12-13 05:42:17 -08:00
fa32e14e7f
Merge pull request #5657 from Kraymer/patch-1
...
Merge pull request 5657
2016-12-13 05:42:16 -08:00
86d45a5989
Update variables.md
...
Fix typo 'page' => 'layout'
2016-12-13 11:14:16 +01:00
8a89f033ad
fix errors.
2016-12-11 19:52:22 +05:30
4f0a7439aa
Update history to reflect merge of #5653 [ci skip]
2016-12-11 03:49:39 -08:00
360c82c95a
Merge pull request #5653 from kimbaudi/patch-1
...
Merge pull request 5653
2016-12-11 03:49:39 -08:00
f5f387711a
update documentation on updating FontAwesome Iconset
2016-12-11 15:35:46 +05:30
b99013cc3d
Improve Permalinks documentation.
...
Add special note: built-in permalink styles are not recognized in the YAML Front Matter.
2016-12-10 23:03:59 -08:00
c09221205a
Update history to reflect merge of #5652 [ci skip]
2016-12-10 12:17:00 -08:00
b6b0fdc05b
Merge pull request #5652 from jekyll/pull/assert_nil
...
Merge pull request 5652
2016-12-10 12:16:59 -08:00
69c4a8a1aa
Use `assert_nil` instead of `assert_equal nil`
...
Fixes #5648
2016-12-10 11:31:04 -06:00
b02f306f0a
Update history to reflect merge of #5513 [ci skip]
2016-12-09 16:01:22 -08:00
8ed324007a
Merge pull request #5513 from thiagoarrais/5415-group_by_exp-filter
...
Merge pull request 5513
2016-12-09 16:01:21 -08:00
d4c8d7fd2b
Ignore symlinked file in windows
2016-12-09 13:15:16 -03:00
43af0aa21b
Update history to reflect merge of #5612 [ci skip]
2016-12-08 20:09:01 -08:00
1049802499
Merge pull request #5612 from ashmaroli/win-tz
...
Merge pull request 5612
2016-12-08 20:09:01 -08:00
81f6f1e404
Update history to reflect merge of #5643 [ci skip]
2016-12-08 04:14:43 -08:00
5ba930bba8
Merge pull request #5643 from hugomd/master
...
Merge pull request 5643
2016-12-08 04:14:43 -08:00
Frank Taillandier
Tom Johnson
jekyllbot
jekyllbot
Kevin Wojniak
Ashwin Maroli
Ivan Dmitrievsky
Fabrice Laporte
kimbaudi
Pat Hawks
Thiago Arrais