Skip to content

fix: socket and saved reply (backport #3000)#3022

Open
mergify[bot] wants to merge 8 commits intomain-hotfixfrom
mergify/bp/main-hotfix/pr-3000
Open

fix: socket and saved reply (backport #3000)#3022
mergify[bot] wants to merge 8 commits intomain-hotfixfrom
mergify/bp/main-hotfix/pr-3000

Conversation

@mergify
Copy link

@mergify mergify bot commented Feb 17, 2026

  1. Socket in customer portal side.
  2. Append Saved Reply to email content instead of replacing it
  3. Redis search syntax error
  4. Dont send notification if user from and user to are same

closes: #2684
closes: #3005


This is an automatic backport of pull request #3000 done by Mergify.

(cherry picked from commit 69e047f)

# Conflicts:
#	desk/src/pages/ticket/TicketCustomer.vue
(cherry picked from commit 29ad7da)
(cherry picked from commit 93bc046)
(cherry picked from commit adb3ee3)
(cherry picked from commit 60584fc)
@mergify
Copy link
Author

mergify bot commented Feb 17, 2026

Cherry-pick of 69e047f has failed:

On branch mergify/bp/main-hotfix/pr-3000
Your branch is up to date with 'origin/main-hotfix'.

You are currently cherry-picking commit 69e047f6.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   desk/src/components/EmailEditor.vue
	modified:   desk/src/pages/SearchAgent.vue

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   desk/src/pages/ticket/TicketCustomer.vue

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant