Commit Graph

630 Commits

Author SHA1 Message Date
Frank Taillandier ad6392dbd5
Merge branch 'master' into patch-1 2018-03-08 16:31:51 +01:00
Frank Taillandier c116296c7e
addressed feedback 2018-03-08 16:31:36 +01:00
jekyllbot 85933e0903 Update history to reflect merge of #276 [ci skip] 2018-03-08 10:26:14 -05:00
Frank Taillandier 330c5cb616 fix #275 (#276)
Merge pull request 276
2018-03-08 10:26:12 -05:00
Ben Balter f19b29ea0a
Merge pull request #273 from j-f1/patch-1
Don’t process the Liquid example in the advanced usage docs
2018-02-20 09:26:55 -05:00
Jed Fox fb1c56a7a8
Don’t process the Liquid example in the advanced usage docs 2018-02-20 08:20:01 -05:00
Frank Taillandier 1f3858ef0a
Merge pull request #268 from jekyll/pull/fix-267
Prevent {% seo %} Liquid parsing
2018-02-02 15:57:45 +01:00
Frank Taillandier 780c5aa1d0
Prevent {% seo %} Liquid parsing 2018-02-02 10:48:31 +01:00
jekyllbot 46ad253d4d Update history to reflect merge of #263 [ci skip] 2018-01-17 05:44:51 -05:00
Wang Shidong e3e6f8ff6b Add webmaster_verifications for baidu (#263)
Merge pull request 263
2018-01-17 05:44:50 -05:00
Frank Taillandier 15cdb60c9a
Merge pull request #254 from jekyll/copyright-notice
Update Copyright notice
2018-01-14 20:15:27 +01:00
Frank Taillandier f87165b885
Merge branch 'master' into copyright-notice 2018-01-06 22:19:31 +01:00
jekyllbot 47200c437a Update history to reflect merge of #260 [ci skip] 2018-01-05 15:03:00 -05:00
jekyllbot d69e08c773
Test against Ruby 2.5 (#260)
Merge pull request 260
2018-01-05 15:02:59 -05:00
Frank Taillandier 84b81fcef8
Update LICENSE.txt 2018-01-03 19:52:21 +01:00
Frank Taillandier 5b2e69806a
Merge branch 'master' into copyright-notice 2018-01-03 19:51:47 +01:00
jekyllbot 520e78385b Update history to reflect merge of #255 [ci skip] 2017-12-11 14:10:36 -05:00
Sea 551fcaa8f3 Use gems config key for Jekyll < 3.5.0 (#255)
Merge pull request 255
2017-12-11 14:10:35 -05:00
Frank Taillandier 1ec3197ba3
Update LICENSE.txt 2017-12-11 18:40:36 +01:00
Frank Taillandier cbff43dd60
Update Copyright notice
Inspired by
https://ben.balter.com/2015/06/03/copyright-notices-for-websites-and-open-source-projects/
😄
2017-12-11 15:11:02 +01:00
Ben Balter b480dde068
Merge pull request #252 from jekyll/release-2.4.0
Release 2.4.0
2017-12-08 10:59:49 -06:00
Frank Taillandier 19137226ab
Update History.markdown 2017-12-04 23:17:27 +01:00
Antonio Trento 7f73d5edef
Update logo field information
As requested by @benbalter I modified the description in the bulleted list associated with the logo field, thanks to the help
2017-12-04 18:00:19 +01:00
Frank Taillandier e181da90f1 Release 💎 2.4.0
Fix #251
2017-12-04 17:05:37 +01:00
jekyllbot 47259715f7 Update history to reflect merge of #181 [ci skip] 2017-12-04 09:53:18 -06:00
Ben Balter b84e54568f Try testing on Ruby v2.3 and 2.4 (#181)
Merge pull request 181
2017-12-04 09:53:17 -06:00
jekyllbot 2414bee8cc Update history to reflect merge of #242 [ci skip] 2017-12-04 09:22:09 -06:00
jekyllbot 466dc1858a
Travis: Test against Rubies (#242)
Merge pull request 242
2017-12-04 09:22:08 -06:00
jekyllbot fc985bf998 Update history to reflect merge of #243 [ci skip] 2017-12-04 09:20:17 -06:00
jekyllbot c8976c8fb2
Avoid deprecation warning when building docs (#243)
Merge pull request 243
2017-12-04 09:20:16 -06:00
Ben Balter 38b0fbd73a
Merge pull request #249 from jekyll/strip-null-values
Strip null values from JSON-LD hash
2017-11-16 14:36:03 -05:00
Ben Balter da96f4d707
strip null values from JSON-LD hash 2017-11-16 11:40:42 -05:00
Ben Balter ca1200b90f
add failing tests for stripping null values 2017-11-16 11:39:26 -05:00
Frank Taillandier 232d9f91ec
Merge pull request #246 from localheinz/fix/self-closing
Fix: Consistently use self-closing tags
2017-11-09 17:48:54 +01:00
Andreas Möller ce38618ee7
Fix: Consistently use self-closing tags 2017-11-08 23:30:32 +01:00
Frank Taillandier 62de1fb078
Merge pull request #241 from jekyll/pull/rubocop-update
Style: Rubocop auto-correct
2017-11-08 20:43:20 +01:00
Frank Taillandier 59cd2257b6
Style: Rubocop auto-correct 2017-10-22 18:37:44 +02:00
Frank Taillandier 7313ee7e50 Merge pull request #237 from jekyll/unified-bass-drop
Pass the unified drop to the template rather than an ad-hoc payload
2017-09-06 21:37:45 +02:00
Ben Balter e31c9e7ca7
add unit tests for Jekyll::SeoTag 2017-09-06 12:33:19 -04:00
Ben Balter 3805012e9a
Template payload should be a UnifiedPayloadDrop, not a hash 2017-09-06 12:16:10 -04:00
Ben Balter d230d6d885 Merge pull request #236 from DirtyF/meta-generator
Add meta generator
2017-09-06 10:27:31 -04:00
Frank Taillandier a6e78cb7dd
Fix test - props @Parkr 2017-09-06 02:00:09 +02:00
Frank Taillandier f9cabae8a6 add jekyll version to the drop 2017-09-06 01:11:33 +02:00
Frank Taillandier 5219054a76 add test for Jekyll version 2017-09-06 00:34:02 +02:00
Frank Taillandier cc092dd95d
add meta generator 2017-09-05 23:19:27 +02:00
Ben Balter 1b66cb1522
Bump to 2.3.0 2017-08-24 15:07:19 -04:00
Ben Balter cf90f9011a
correct source and dest dir paths in spec helper, props @bogdanvlviv 2017-08-24 14:56:51 -04:00
Ben Balter f3ba20621e Escape __dir__ 2017-08-24 14:42:54 -04:00
Ben Balter 8a1a5332a9 Update for #232 2017-08-24 14:42:38 -04:00
Ben Balter a5463b175c Merge pull request #232 from jekyll/define-path-with-__dir__
Define path with __dir__
2017-08-24 14:40:08 -04:00