From e181da90f1b3765a40508d1f075d6750dd0ad80d Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Mon, 4 Dec 2017 17:05:15 +0100 Subject: [PATCH 01/15] Release :gem: 2.4.0 Fix #251 --- History.markdown | 11 +++++++++-- lib/jekyll-seo-tag/version.rb | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/History.markdown b/History.markdown index 869cbc0..50c8280 100644 --- a/History.markdown +++ b/History.markdown @@ -1,13 +1,20 @@ ## HEAD +## 2.4.0 / 2017-12-04 + +### Minor + + * Add meta generator (#236) + * Strip null values from JSON-LD hash (#249) + ### Documentation * Avoid deprecation warning when building docs (#243) ### Development Fixes - * Travis: Test against Rubies (#242) - * Try testing on Ruby v2.3 and 2.4 (#181) + * Test against latest Rubies (#242) + * Use Nokigiri on CI (#181) ## 2.3.0 diff --git a/lib/jekyll-seo-tag/version.rb b/lib/jekyll-seo-tag/version.rb index 6cd555f..ed89abd 100644 --- a/lib/jekyll-seo-tag/version.rb +++ b/lib/jekyll-seo-tag/version.rb @@ -5,6 +5,6 @@ module Liquid; class Tag; end; end module Jekyll class SeoTag < Liquid::Tag - VERSION = "2.3.0".freeze + VERSION = "2.4.0".freeze end end From 19137226ab79cb27457932d7494c7e43f233c85b Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Mon, 4 Dec 2017 23:17:27 +0100 Subject: [PATCH 02/15] Update History.markdown --- History.markdown | 1 + 1 file changed, 1 insertion(+) diff --git a/History.markdown b/History.markdown index 50c8280..a6b7044 100644 --- a/History.markdown +++ b/History.markdown @@ -5,6 +5,7 @@ ### Minor * Add meta generator (#236) + * Consistently use self-closing tags (#246) * Strip null values from JSON-LD hash (#249) ### Documentation From cbff43dd6067b2e757ea37d76442ac5606ae3c1e Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Mon, 11 Dec 2017 15:11:02 +0100 Subject: [PATCH 03/15] Update Copyright notice Inspired by https://ben.balter.com/2015/06/03/copyright-notices-for-websites-and-open-source-projects/ :smile: --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index eb3260f..a38d0cb 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015 Ben Balter +Copyright (c) 2015-2017 Ben Balter and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 1ec3197ba39db0285806ae58ff4c7cb4001fe3ee Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Mon, 11 Dec 2017 18:40:36 +0100 Subject: [PATCH 04/15] Update LICENSE.txt --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index a38d0cb..84d5ece 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2017 Ben Balter and contributors +Copyright (c) 2015-2018 Ben Balter and contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 551fcaa8f3b0ae729698c90ff4ad2cec6e452a98 Mon Sep 17 00:00:00 2001 From: Sea <30443703+seafr@users.noreply.github.com> Date: Mon, 11 Dec 2017 23:10:35 +0400 Subject: [PATCH 05/15] Use gems config key for Jekyll < 3.5.0 (#255) Merge pull request 255 --- docs/installation.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/installation.md b/docs/installation.md index e2c3d56..e67d534 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -13,6 +13,8 @@ - jekyll-seo-tag ``` +If you are using a Jekyll version less than `3.5.0`, use the `gems` key instead of `plugins`. + 3. Add the following right before `` in your site's template(s): ```liquid From 520e78385b21f86bb7edb934007d99f0b217a9c2 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Mon, 11 Dec 2017 14:10:36 -0500 Subject: [PATCH 06/15] Update history to reflect merge of #255 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index a6b7044..38218f8 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,9 @@ ## HEAD +### Documentation + + * Use gems config key for Jekyll < 3.5.0 (#255) + ## 2.4.0 / 2017-12-04 ### Minor From 84b81fcef8ff5eff9531338fff5838e924aefb05 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Wed, 3 Jan 2018 19:52:21 +0100 Subject: [PATCH 07/15] Update LICENSE.txt --- LICENSE.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index 84d5ece..3b5c0a6 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2018 Ben Balter and contributors +Copyright (c) 2015-present Ben Balter and the jekyll-seo-tag contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From d69e08c77308177cf6a96689eb484909de855a3f Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 5 Jan 2018 15:02:59 -0500 Subject: [PATCH 08/15] Test against Ruby 2.5 (#260) Merge pull request 260 --- .travis.yml | 1 + jekyll-seo-tag.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ae1aeb0..9c2e01e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ rvm: - 2.2 - 2.3 - 2.4 + - 2.5 before_install: gem install bundler language: ruby script: script/cibuild diff --git a/jekyll-seo-tag.gemspec b/jekyll-seo-tag.gemspec index 9ba4c98..7d1529c 100644 --- a/jekyll-seo-tag.gemspec +++ b/jekyll-seo-tag.gemspec @@ -30,5 +30,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency "bundler", "~> 1.15" spec.add_development_dependency "html-proofer", "~> 3.7" spec.add_development_dependency "rspec", "~> 3.5" - spec.add_development_dependency "rubocop", "~> 0.5" + spec.add_development_dependency "rubocop", "0.51" end From 47200c437a9f817852a2bc18bd6ae98868aedff4 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Fri, 5 Jan 2018 15:03:00 -0500 Subject: [PATCH 09/15] Update history to reflect merge of #260 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 38218f8..85ad0e2 100644 --- a/History.markdown +++ b/History.markdown @@ -4,6 +4,10 @@ * Use gems config key for Jekyll < 3.5.0 (#255) +### Development Fixes + + * Test against Ruby 2.5 (#260) + ## 2.4.0 / 2017-12-04 ### Minor From e3e6f8ff6b9d167a35cef9b897d4e17d496dce20 Mon Sep 17 00:00:00 2001 From: Wang Shidong Date: Wed, 17 Jan 2018 18:44:50 +0800 Subject: [PATCH 10/15] Add webmaster_verifications for baidu (#263) Merge pull request 263 --- docs/usage.md | 1 + lib/template.html | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/docs/usage.md b/docs/usage.md index 0f77707..deff223 100644 --- a/docs/usage.md +++ b/docs/usage.md @@ -54,6 +54,7 @@ webmaster_verifications: bing: 1234 alexa: 1234 yandex: 1234 + baidu: 1234 ``` * `lang` - The locale these tags are marked up in. Of the format `language_TERRITORY`. Default is `en_US`. diff --git a/lib/template.html b/lib/template.html index 0068a81..eabfbd4 100755 --- a/lib/template.html +++ b/lib/template.html @@ -95,6 +95,10 @@ {% if site.webmaster_verifications.yandex %} {% endif %} + + {% if site.webmaster_verifications.baidu %} + + {% endif %} {% elsif site.google_site_verification %} {% endif %} From 46ad253d4de8d8064b4156a9db530399bdd9ec11 Mon Sep 17 00:00:00 2001 From: jekyllbot Date: Wed, 17 Jan 2018 05:44:51 -0500 Subject: [PATCH 11/15] Update history to reflect merge of #263 [ci skip] --- History.markdown | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/History.markdown b/History.markdown index 85ad0e2..c589343 100644 --- a/History.markdown +++ b/History.markdown @@ -8,6 +8,10 @@ * Test against Ruby 2.5 (#260) +### Minor Enhancements + + * Add webmaster_verifications for baidu (#263) + ## 2.4.0 / 2017-12-04 ### Minor From 780c5aa1d0a0e49253630f6eee2fd63526f7c039 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Fri, 2 Feb 2018 10:48:31 +0100 Subject: [PATCH 12/15] Prevent {% seo %} Liquid parsing --- docs/installation.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/installation.md b/docs/installation.md index e67d534..3d7095e 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -17,6 +17,8 @@ If you are using a Jekyll version less than `3.5.0`, use the `gems` key instead 3. Add the following right before `` in your site's template(s): +{% raw %} ```liquid {% seo %} ``` +{% endraw %} From fb1c56a7a8f24b488dd03e9c4fd91395d769c54d Mon Sep 17 00:00:00 2001 From: Jed Fox Date: Tue, 20 Feb 2018 08:20:01 -0500 Subject: [PATCH 13/15] =?UTF-8?q?Don=E2=80=99t=20process=20the=20Liquid=20?= =?UTF-8?q?example=20in=20the=20advanced=20usage=20docs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/advanced-usage.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/advanced-usage.md b/docs/advanced-usage.md index edbf9ee..c2fbed5 100644 --- a/docs/advanced-usage.md +++ b/docs/advanced-usage.md @@ -6,9 +6,11 @@ Jekyll SEO Tag is designed to implement SEO best practices by default and to be If for some reason, you don't want the plugin to output `` tags on each page, simply invoke the plugin within your template like so: +<!-- {% raw %} --> ``` {% seo title=false %} ``` +<!-- {% endraw %} --> ### Author information From 330c5cb616e553000a4fcb3c0feba44de2d48dbb Mon Sep 17 00:00:00 2001 From: Frank Taillandier <frank.taillandier@gmail.com> Date: Thu, 8 Mar 2018 16:26:12 +0100 Subject: [PATCH 14/15] fix #275 (#276) Merge pull request 276 --- docs/installation.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/installation.md b/docs/installation.md index 3d7095e..4a91340 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -17,8 +17,8 @@ If you are using a Jekyll version less than `3.5.0`, use the `gems` key instead 3. Add the following right before `</head>` in your site's template(s): -{% raw %} +<!-- {% raw %} --> ```liquid {% seo %} ``` -{% endraw %} +<!-- {% endraw %} --> From 85933e090317c1071c5998f884df7f388e979bde Mon Sep 17 00:00:00 2001 From: jekyllbot <jekyllbot@jekyllrb.com> Date: Thu, 8 Mar 2018 10:26:14 -0500 Subject: [PATCH 15/15] Update history to reflect merge of #276 [ci skip] --- History.markdown | 2 ++ 1 file changed, 2 insertions(+) diff --git a/History.markdown b/History.markdown index c589343..98dffcc 100644 --- a/History.markdown +++ b/History.markdown @@ -1,5 +1,7 @@ ## HEAD + * Docs: Prevent GitHub Pages from processing Liquid raw tag (#276) + ### Documentation * Use gems config key for Jekyll < 3.5.0 (#255)