From 937d4f78a8fb99d893bd58578b203872867f2d5d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 16 Jan 2025 20:05:53 +0530 Subject: [PATCH 1/6] fix: rendering for woot modal (#10707) --- .../routes/dashboard/settings/attributes/Index.vue | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue index 24ff3ec1b..1aefea59f 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/attributes/Index.vue @@ -99,15 +99,11 @@ const onClickTabChange = index => { :attribute-model="attributeModel" /> - - - + :selected-attribute-model-tab="selectedTabIndex" + /> From c0ad0b4cc11f373941efcb54ac72a3f9e7cc2929 Mon Sep 17 00:00:00 2001 From: Pranav Date: Thu, 16 Jan 2025 10:59:09 -0800 Subject: [PATCH 2/6] fix: Re-enable scheduled jobs (#10708) During Captain, scheduled jobs were disabled. This PR would re-enable them --- config/schedule.yml | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/config/schedule.yml b/config/schedule.yml index 17e7eba00..d8d23172b 100644 --- a/config/schedule.yml +++ b/config/schedule.yml @@ -8,27 +8,27 @@ internal_check_new_versions_job: class: 'Internal::CheckNewVersionsJob' queue: scheduled_jobs # # executed At every 5th minute.. -# trigger_scheduled_items_job: -# cron: '*/5 * * * *' -# class: 'TriggerScheduledItemsJob' -# queue: scheduled_jobs +trigger_scheduled_items_job: + cron: '*/5 * * * *' + class: 'TriggerScheduledItemsJob' + queue: scheduled_jobs -# # executed At every minute.. -# trigger_imap_email_inboxes_job: -# cron: '*/1 * * * *' -# class: 'Inboxes::FetchImapEmailInboxesJob' -# queue: scheduled_jobs +# executed At every minute.. +trigger_imap_email_inboxes_job: + cron: '*/1 * * * *' + class: 'Inboxes::FetchImapEmailInboxesJob' + queue: scheduled_jobs -# # executed daily at 2230 UTC -# # which is our lowest traffic time -# remove_stale_contact_inboxes_job.rb: -# cron: '30 22 * * *' -# class: 'Internal::RemoveStaleContactInboxesJob' -# queue: scheduled_jobs +# executed daily at 2230 UTC +# which is our lowest traffic time +remove_stale_contact_inboxes_job.rb: + cron: '30 22 * * *' + class: 'Internal::RemoveStaleContactInboxesJob' + queue: scheduled_jobs -# # executed daily at 2230 UTC -# # which is our lowest traffic time -# remove_stale_redis_keys_job.rb: -# cron: '30 22 * * *' -# class: 'Internal::RemoveStaleRedisKeysJob' -# queue: scheduled_jobs +# executed daily at 2230 UTC +# which is our lowest traffic time +remove_stale_redis_keys_job.rb: + cron: '30 22 * * *' + class: 'Internal::RemoveStaleRedisKeysJob' + queue: scheduled_jobs From 257f59e219c59cd409bb1554fee95c9f43b1653c Mon Sep 17 00:00:00 2001 From: Sojan Jose Date: Fri, 17 Jan 2025 00:29:33 +0530 Subject: [PATCH 3/6] chore: Update SECURITY.md (#10705) Move vulnerability reporting to Github. --- SECURITY.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 0722f9217..ee9eba0b8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,13 +2,13 @@ Chatwoot is looking forward to working with security researchers worldwide to ke ## Reporting a Vulnerability -We use [huntr.dev](https://huntr.dev/) for security issues that affect our project. If you believe you have found a vulnerability, please disclose it via this [form](https://huntr.dev/bounties/disclose). This will enable us to review the vulnerability, fix it promptly, and reward you for your efforts. +We use Github to track the security issues that affect our project. If you believe you have found a vulnerability, please disclose it via this [form](https://github.com/chatwoot/chatwoot/security/advisories/new). This will enable us to review the vulnerability, fix it promptly, and reward you for your efforts. If you have any questions about the process, contact security@chatwoot.com. -Please try your best to describe a clear and realistic impact for your report, and please don't open any public issues on GitHub or social media; we're doing our best to respond through Huntr as quickly as possible. +Please try your best to describe a clear and realistic impact for your report, and please don't open any public issues on GitHub or social media; we're doing our best to respond through Github as quickly as possible. -> Note: Please use the email for questions related to the process. Disclosures should be done via [huntr.dev](https://huntr.dev/) +> Note: Please use the email for questions related to the process. Disclosures should be done via [Github](https://github.com/chatwoot/chatwoot/security/advisories/new) ## Supported versions | Version | Supported | @@ -48,7 +48,7 @@ We consider the following out of scope, though there may be exceptions. - Brute force attacks - DNSSEC -If you are unsure about the scope, please create a [report](https://huntr.dev/repos/chatwoot/chatwoot/). +If you are unsure about the scope, please create a [report](https://github.com/chatwoot/chatwoot/security/advisories/new). ## Thanks From c20cb9535b0d56ecaf9497603c4a542f0bd66d59 Mon Sep 17 00:00:00 2001 From: Pranav Date: Thu, 16 Jan 2025 11:20:34 -0800 Subject: [PATCH 4/6] fix: Remove backdrop-blur from Modal (#10709) Remove backdrop-blur-[100px] from Modal as it was causing issues with old design pages. --- app/javascript/dashboard/components/Modal.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/javascript/dashboard/components/Modal.vue b/app/javascript/dashboard/components/Modal.vue index ecb5758d7..a1f7ba5ed 100644 --- a/app/javascript/dashboard/components/Modal.vue +++ b/app/javascript/dashboard/components/Modal.vue @@ -75,7 +75,7 @@ onMounted(() => { @mousedown="handleMouseDown" >