mirror of
https://github.com/wassname/talk.git
synced 2026-07-04 03:37:14 +08:00
Merge branch 'master' into docs-plug
This commit is contained in:
@@ -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.
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -2,19 +2,16 @@
|
||||
"server": [
|
||||
"talk-plugin-auth",
|
||||
"talk-plugin-featured-comments",
|
||||
"talk-plugin-offtopic",
|
||||
"talk-plugin-respect"
|
||||
],
|
||||
"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-sort-most-replied",
|
||||
|
||||
@@ -45,9 +45,9 @@ export default class ModerationActions extends React.Component {
|
||||
)}
|
||||
</span>
|
||||
{menuVisible && (
|
||||
<Menu className="talk-plugin-modetarion-actions-menu">
|
||||
<Menu className="talk-plugin-moderation-actions-menu">
|
||||
<Slot
|
||||
className="talk-plugin-modetarion-actions-slot"
|
||||
className="talk-plugin-moderation-actions-slot"
|
||||
fill="moderationActions"
|
||||
passthrough={slotPassthrough}
|
||||
/>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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',
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user