Merge PR #14501 google play reviews channel
# Conflicts: # app/controllers/api/v1/accounts/inboxes_controller.rb # app/helpers/api/v1/inboxes_helper.rb # app/javascript/dashboard/components-next/icon/provider.js # app/javascript/dashboard/components-next/message/MessageMeta.vue # app/javascript/dashboard/composables/useInbox.js # app/javascript/dashboard/constants/editor.js # app/javascript/dashboard/helper/inbox.js # app/javascript/dashboard/i18n/locale/en/inboxMgmt.json # app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelFactory.vue # app/javascript/dashboard/routes/dashboard/settings/inbox/ChannelList.vue # app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue # app/javascript/dashboard/routes/dashboard/settings/inbox/components/ChannelName.vue # app/javascript/shared/mixins/inboxMixin.js # app/views/api/v1/models/_inbox.json.jbuilder # config/schedule.yml # db/schema.rb
This commit is contained in:
@@ -119,6 +119,11 @@ export const FORMATTING = {
|
||||
nodes: [],
|
||||
menu: [],
|
||||
},
|
||||
'Channel::GooglePlay': {
|
||||
marks: [],
|
||||
nodes: [],
|
||||
menu: [],
|
||||
},
|
||||
// Special contexts (not actual channels)
|
||||
'Context::PrivateNote': {
|
||||
marks: ['strong', 'em', 'code', 'link', 'strike'],
|
||||
|
||||
Reference in New Issue
Block a user