From cc0dcc1620634092ffa297f254a5c206e25bf4a7 Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Wed, 21 Mar 2018 14:12:44 -0400 Subject: [PATCH 1/5] Update default plugins --- plugins.default.json | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/plugins.default.json b/plugins.default.json index 066c94478..b80e6b9c3 100644 --- a/plugins.default.json +++ b/plugins.default.json @@ -2,21 +2,20 @@ "server": [ "talk-plugin-auth", "talk-plugin-featured-comments", - "talk-plugin-offtopic", - "talk-plugin-respect" + "talk-plugin-respect", + "talk-plugin-rich-text" ], "client": [ "talk-plugin-auth", "talk-plugin-author-menu", - "talk-plugin-comment-content", "talk-plugin-featured-comments", "talk-plugin-flag-details", "talk-plugin-ignore-user", "talk-plugin-member-since", "talk-plugin-moderation-actions", - "talk-plugin-offtopic", "talk-plugin-permalink", "talk-plugin-respect", + "talk-plugin-rich-text", "talk-plugin-sort-most-replied", "talk-plugin-sort-most-respected", "talk-plugin-sort-newest", From ad1ea9a8102d1d46921ca414c3055ba7296cf4ef Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 21 Mar 2018 16:09:02 -0600 Subject: [PATCH 2/5] Updated Notifications Docs --- plugins/talk-plugin-notifications/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/talk-plugin-notifications/README.md b/plugins/talk-plugin-notifications/README.md index 9e8318a0f..58293fee7 100644 --- a/plugins/talk-plugin-notifications/README.md +++ b/plugins/talk-plugin-notifications/README.md @@ -15,7 +15,7 @@ anything. You need to enable one of the `talk-plugin-notifications-category-*` p Configuration: -- `DISABLE_REQUIRE_EMAIL_VERIFICATIONS` - When `TRUE`, it will disable the verification email check before sending notifications for those emails. **Note that organizations implementing a custom authentication system _must_ disable this feature, as they don't use our integrated auth**. (Default `FALSE`). +- `TALK_DISABLE_REQUIRE_EMAIL_VERIFICATIONS_NOTIFICATIONS` - When `TRUE`, it will disable the verification email check before sending notifications for those emails. **Note that organizations implementing a custom authentication system _must_ disable this feature, as they don't use our integrated auth**. (Default `FALSE`). - `TALK_CLIENT_FORCE_NOTIFICATION_SETTINGS` - When `TRUE`, the settings pane for notifications will show always, even if the user does not have a `local` profile. (Default `FALSE`). You can enable other notification options by adding more From 37994959297d2542ff92590f407c84a5eeec13ae Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Wed, 21 Mar 2018 18:25:47 -0400 Subject: [PATCH 3/5] Remove rich text from default for now --- plugins.default.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins.default.json b/plugins.default.json index b80e6b9c3..ca17c79d8 100644 --- a/plugins.default.json +++ b/plugins.default.json @@ -2,8 +2,7 @@ "server": [ "talk-plugin-auth", "talk-plugin-featured-comments", - "talk-plugin-respect", - "talk-plugin-rich-text" + "talk-plugin-respect" ], "client": [ "talk-plugin-auth", @@ -15,7 +14,6 @@ "talk-plugin-moderation-actions", "talk-plugin-permalink", "talk-plugin-respect", - "talk-plugin-rich-text", "talk-plugin-sort-most-replied", "talk-plugin-sort-most-respected", "talk-plugin-sort-newest", From b9420406ed8960fa57c3c653fe22ce54387df30d Mon Sep 17 00:00:00 2001 From: Wyatt Johnson Date: Wed, 21 Mar 2018 16:26:22 -0600 Subject: [PATCH 4/5] removed rich text from defaults --- config.js | 2 +- docs/source/_data/plugins.yml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/config.js b/config.js index b24c5dfc9..48f554680 100644 --- a/config.js +++ b/config.js @@ -53,7 +53,7 @@ const CONFIG = { process.env.TALK_LOGGING_LEVEL ) ? process.env.TALK_LOGGING_LEVEL - : 'info', + : process.env.NODE_ENV === 'test' ? 'fatal' : 'info', // REVISION_HASH when using the docker build will contain the build hash that // it was built at. diff --git a/docs/source/_data/plugins.yml b/docs/source/_data/plugins.yml index 35883ee8f..1b8dcc1c5 100644 --- a/docs/source/_data/plugins.yml +++ b/docs/source/_data/plugins.yml @@ -13,8 +13,6 @@ - default - name: talk-plugin-comment-content description: Linkifies comment content that contains links. - tags: - - default - name: talk-plugin-deep-reply-count description: Enables deep reply count graph edge including all decendant replies. - name: talk-plugin-facebook-auth @@ -79,8 +77,6 @@ - notifications - name: talk-plugin-offtopic description: Allows users to mark a comment as off-topic when they create it. - tags: - - default - name: talk-plugin-permalink description: Shows a Link button on comments for direct-linking to a comment. tags: From 678f5355007842695a23bfdc2d4742da23a5cf22 Mon Sep 17 00:00:00 2001 From: Kim Gardner Date: Wed, 21 Mar 2018 19:08:13 -0400 Subject: [PATCH 5/5] Fix typos --- .../client/components/ModerationActions.js | 4 ++-- test/e2e/page_objects/embedStream.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js index 272202d9c..c4603d090 100644 --- a/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js +++ b/plugins/talk-plugin-moderation-actions/client/components/ModerationActions.js @@ -45,9 +45,9 @@ export default class ModerationActions extends React.Component { )} {menuVisible && ( - + diff --git a/test/e2e/page_objects/embedStream.js b/test/e2e/page_objects/embedStream.js index fab864987..be60fc8d0 100644 --- a/test/e2e/page_objects/embedStream.js +++ b/test/e2e/page_objects/embedStream.js @@ -129,7 +129,7 @@ module.exports = { selector: '.talk-plugin-moderation-actions', elements: { arrow: '.talk-plugin-moderation-actions-arrow', - menu: '.talk-plugin-modetarion-actions-menu', + menu: '.talk-plugin-moderation-actions-menu', banButton: '.talk-plugin-moderation-actions-ban', }, },