From 6629b505f299760dd3f59b3b8db8c27fe5b01dc8 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Fri, 11 Dec 2015 12:21:11 +0100 Subject: [PATCH 1/7] Prepare release --- CHANGELOG.md | 6 ++++++ blueprints.yaml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c820e1c..dfef2f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.1.2 +## 12/11/2015 + +1. [](#improved) + Fix double escaping comments text and author + # v1.1.1 ## 12/10/2015 diff --git a/blueprints.yaml b/blueprints.yaml index 7416773..67e25a3 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Comments -version: 1.1.1 +version: 1.1.2 description: Adds a commenting functionality to your site icon: comment author: From f25fbd7e20fc690501ec49af56cd76893ca1609e Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Sat, 12 Dec 2015 14:28:10 +0100 Subject: [PATCH 2/7] Disable captcha by default, add instructions on how to add it --- README.md | 5 ++--- comments.yaml | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 72aa4ac..d92f23f 100644 --- a/README.md +++ b/README.md @@ -16,8 +16,6 @@ Or clone from GitHub and put in the `user/plugins/comments` folder. # Usage -Edit the - Add `{% include 'partials/comments.html.twig' with {'page': page} %}` to the template file where you want to add comments. For example, in Antimatter, in `templates/item.html.twig`: @@ -51,7 +49,8 @@ To set the enabled routes, create a `user/config/plugins/comments.yaml` file, co # Enabling Recaptcha -The plugin comes with Recaptcha integration. To make it work, add your own Recaptcha `site` and `secret` keys the the plugin yaml config file. +The plugin comes with Recaptcha integration. To make it work, create a `user/config/plugins/comments.yaml` file, copy in it the contents of `user/plugins/comments/comments.yaml` and uncomment the capthca form field and the captcha validation process. +Make sure you add your own Recaptcha `site` and `secret` keys too. # Where are the comments stored? diff --git a/comments.yaml b/comments.yaml index ea24031..a401c97 100644 --- a/comments.yaml +++ b/comments.yaml @@ -50,15 +50,15 @@ form: type: hidden evaluateDefault: grav.uri.path - - name: g-recaptcha-response - label: Captcha - type: captcha - recatpcha_site_key: e32iojeoi32jeoi32jeoij32oiej32oiej3 - recaptcha_not_validated: 'Captcha not valid!' - validate: - required: true - process: - ignore: true +# - name: g-recaptcha-response +# label: Captcha +# type: captcha +# recatpcha_site_key: e32iojeoi32jeoi32jeoij32oiej32oiej3 +# recaptcha_not_validated: 'Captcha not valid!' +# validate: +# required: true +# process: +# ignore: true buttons: - type: submit @@ -68,8 +68,8 @@ form: - email: subject: "[New Comment] from {{ form.value.name|e }}" body: "{% include 'forms/data.html.twig' %}" - - captcha: - recatpcha_secret: ej32oiej23oiej32oijeoi32jeio32je +# - captcha: +# recatpcha_secret: ej32oiej23oiej32oijeoi32jeio32je - addComment: - message: Thank you for writing your comment! From a6476ab5278d130b18ffad04e124db2a41059b3b Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Sun, 20 Dec 2015 10:14:51 +0100 Subject: [PATCH 3/7] Increase priority for onPageInitialized in the comments plugin over the form plugin one --- comments.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comments.php b/comments.php index 1dda2ac..743971d 100644 --- a/comments.php +++ b/comments.php @@ -26,7 +26,7 @@ class CommentsPlugin extends Plugin return [ 'onPluginsInitialized' => ['onPluginsInitialized', 0], 'onFormProcessed' => ['onFormProcessed', 0], - 'onPageInitialized' => ['onPageInitialized', 0], + 'onPageInitialized' => ['onPageInitialized', 10], 'onTwigSiteVariables' => ['onTwigSiteVariables', 0] ]; } From 7aabf397f63dcb56c8f167b51e4f54b2fe371c34 Mon Sep 17 00:00:00 2001 From: khanduras Date: Sun, 20 Dec 2015 23:20:04 -0800 Subject: [PATCH 4/7] Update README.md Minor edit for email plugin --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d92f23f..e1d4eda 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,8 @@ The comment form will appear on the blog post items matching the enabled routes. To set the enabled routes, create a `user/config/plugins/comments.yaml` file, copy in it the contents of `user/plugins/comments/comments.yaml` and edit the `enable_on_routes` and `disable_on_routes` options according to your needs. +> Make sure you configured the "Email from" and "Email to" email addresses in the Email plugin with your email address! + # Enabling Recaptcha The plugin comes with Recaptcha integration. To make it work, create a `user/config/plugins/comments.yaml` file, copy in it the contents of `user/plugins/comments/comments.yaml` and uncomment the capthca form field and the captcha validation process. @@ -71,4 +73,4 @@ The plugin interacts with the Email plugin to send emails upon receiving a comme - Allow to delete comments from the Admin Plugin - Ability to see all comments of a page in the Admin Plugin - Ability to reply to a comment from the Admin Plugin -- Auto-fill the comment form when a user is logged in \ No newline at end of file +- Auto-fill the comment form when a user is logged in From 9c20e4f6e5f02b6ddbecb4f88adb8194a36ccc27 Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Wed, 6 Jan 2016 09:44:20 +0100 Subject: [PATCH 5/7] Update changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ea0143..e505f07 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# v1.1.3 +## 01/06/2015 + +1. [](#improved) + * Disable captcha by default, added instructions on how to enable it +1. [](#bugfix) + * Increase priority for onPageInitialized in the comments plugin over the form plugin one to prevent an issue when saving comments + # v1.1.2 ## 12/11/2015 From 1f46ce7e8b333146554521896fd79cb5b7642b3a Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Wed, 6 Jan 2016 09:44:42 +0100 Subject: [PATCH 6/7] Fix year! --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e505f07..5b03e02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,5 @@ # v1.1.3 -## 01/06/2015 +## 01/06/2016 1. [](#improved) * Disable captcha by default, added instructions on how to enable it From 440c57434eecbd74ec0a549ce828709668b48c71 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Wed, 6 Jan 2016 12:36:44 -0700 Subject: [PATCH 7/7] version update --- blueprints.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blueprints.yaml b/blueprints.yaml index 67e25a3..2962541 100644 --- a/blueprints.yaml +++ b/blueprints.yaml @@ -1,5 +1,5 @@ name: Comments -version: 1.1.2 +version: 1.1.3 description: Adds a commenting functionality to your site icon: comment author: