akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity
3,899 Commits 679 Branches 152 Tags
ac85ccf2cfeacd0296ff04d968fe18efc66055ae
Commit Graph
3899 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Muhsin Keloth ac85ccf2cf Merge branch 'CW-3013' of https://github.com/chatwoot/chatwoot into CW-3013 2024-02-08 16:24:35 +05:30
Muhsin Keloth 78a4dce5b9 fix: Contact create logic 2024-02-08 16:22:13 +05:30
Muhsin KelothandGitHub 28c1dd0a26 Merge branch 'develop' into CW-3013 2024-02-08 15:47:56 +05:30
Muhsin Keloth 377aeb8087 chore: fix specs 2024-02-08 15:47:31 +05:30
Sivin VargheseGitHubMuhsin Keloth
 		57dd979a14 feat: Inbox list filter (#8880) 
* feat: Inbox list filter

* fix: routes after delete/unread

* fix: Specs

* feat: Handle sort in frontend

* chore: Minor fixes

* chore: Minor fix

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
 2024-02-08 12:11:01 +05:30
Muhsin KelothandGitHub 117a1405e5 Merge branch 'develop' into CW-3013 2024-02-08 11:25:41 +05:30
Vishnu NarayananGitHubSojan
 		c1d07a5471 feat: Add sidekiq jobs to monitor applied SLAs (#8828) 
Fixes: https://linear.app/chatwoot/issue/CW-2983/sidekiq-jobservice-to-monitor-sla-breach

Co-authored-by: Sojan <sojan@pepalo.com>
 2024-02-07 21:44:56 +04:00
JatinGitHubMuhsin Keloth
 		98eddd0532 fix: Send push notification on bot_handoff (#7636) 
Send a 'Conversation Created' push notification when the bot does a hand_off.
fixes: #7587

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
 2024-02-07 17:45:08 +04:00
Muhsin KelothandGitHub 1b21e0d429 feat: Add notification.updated event (#8871) 2024-02-07 18:15:51 +05:30
Muhsin Keloth 1f8ac8a59c Merge branch 'CW-3013' of https://github.com/chatwoot/chatwoot into CW-3013 2024-02-07 17:32:41 +05:30
Muhsin Keloth 78855afe8b Update incoming_message_service_spec.rb 2024-02-07 17:32:39 +05:30
Muhsin Keloth 2566155e04 Update incoming_message_service_spec.rb 2024-02-07 16:20:51 +05:30
Muhsin Keloth ce6ae2cc47 Merge branch 'CW-3013' of https://github.com/chatwoot/chatwoot into CW-3013 2024-02-07 15:57:55 +05:30
Muhsin Keloth 9ecb847d9b feat: set first and last name for email 2024-02-07 15:57:44 +05:30
Muhsin KelothandGitHub fdffc39663 Merge branch 'develop' into CW-3013 2024-02-07 15:50:20 +05:30
Muhsin Keloth ac5aee3c8d Update incoming_message_whatsapp_cloud_service_spec.rb 2024-02-07 15:50:08 +05:30
Sojan JoseandGitHub 7776b74126 chore: Apply fixes for items in rubocop_todo [CW-1806] (#8864) 
This PR addresses several items listed in our rubocop_todo by implementing the necessary corrections and enhancements. As a result, we are now able to remove the rubocop_todo file entirely, streamlining our codebase and ensuring adherence to our coding standards.

fixes: https://linear.app/chatwoot/issue/CW-1806/chore-rubocop-audit
 2024-02-07 13:36:04 +04:00
Muhsin KelothandGitHub 94ede8a654 Merge branch 'develop' into CW-3013 2024-02-07 14:42:32 +05:30
Muhsin KelothandGitHub 3abb887445 fix: Change the route from inbox to inbox-view (#8874) 
* fix: Change inbox to inbox-view

* fix: route fixes

* Update ContactInfo.vue

* Update conversation.routes.js
 2024-02-07 14:34:18 +05:30
Muhsin Keloth 07a7c1eb8b fix: specs 2024-02-07 14:34:11 +05:30
Muhsin Keloth b125ac1ad6 Update message_builder.rb 2024-02-07 14:05:32 +05:30
Muhsin Keloth ecfa19bb1a fix: route push fixes 2024-02-07 14:02:29 +05:30
Muhsin KelothandGitHub 733a851607 Merge branch 'develop' into CW-3013 2024-02-07 13:35:57 +05:30
Shivam MishraGitHubMuhsin Keloth
 		a9ec3ae098 test: ensure that timestamp is in correct range (#8868) 
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
 2024-02-07 13:35:31 +05:30
Muhsin Keloth 8c4b13b737 feat: set first and last name for WhatsApp 2024-02-07 13:33:57 +05:30
Muhsin Keloth 1c73aa9ef4 feat: set first and last name for instagram 2024-02-07 13:20:41 +05:30
Sivin VargheseGitHubMuhsin Keloth
 		53927b5a72 chore: Inbox view improvements (#8866) 
* chore: Inbox view improvements

* chore: Review fix

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
 2024-02-07 13:14:58 +05:30
Muhsin Keloth bafaf9c786 feat: add split_first_and_last_name helper 2024-02-07 12:42:53 +05:30
Muhsin KelothandGitHub 75dd77a92d Merge branch 'develop' into CW-3013 2024-02-07 12:38:11 +05:30
Muhsin KelothandGitHub d67b91d2b0 feat: Sort Notification API changes (#8865) 
* feat: Inbox sort API changes

* Update notification_finder.rb

* Update notification_finder.rb

* Update notification_finder.rb
 2024-02-06 21:03:22 +05:30
Sojan JoseandGitHub a4fc28abc0 chore: Squash migrations till 05/2023 (#8862) 
- Squash the old migrations up 05/2023 to a single file
 2024-02-06 17:00:38 +04:00
Nithin David ThomasGitHubSivin Varghese
 		bee2a14620 feat: Creates radio select form input for onboarding form (#8860) 
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
 2024-02-06 03:21:46 -08:00
Ali BehnamfardGitHubVishnu Narayanan
 		168a4dc323 fix: build error during development using docker-compose (#8714) 
* Fix ssl error in final build stage

* add env to docker compose

---------

Co-authored-by: Vishnu Narayanan <iamwishnu@gmail.com>
 2024-02-06 12:56:53 +05:30
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 		47c0decf1e chore(deps): bump nokogiri from 1.16.0 to 1.16.2 (#8861) 
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.16.0 to 1.16.2.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.16.0...v1.16.2)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-02-06 09:47:16 +04:00
Shivam MishraGitHubSojan Jose
 		8acc818f68 feat: allow bulk invite create via email (#8853) 
* feat: add agent builder

* feat: use new agent builder

* refactor: validate limit

* test: agent limits

* feat: allow bulk create

* feat: allow bulk create

* refactor: rename current_user to inviter in AgentBuilder

* refactor: move limits tests to enterprise

* test: send correct params

* refactor: account builder returns both user and account_user

* chore: Revert "refactor: account builder returns both user and account_user"

This reverts commit 1419789871e8a3b8ff57af27fe53925b1486a839.

* feat: return user as is

* Update agent_builder.rb

- minor update

---------

Co-authored-by: Sojan Jose <sojan@pepalo.com>
 2024-02-06 09:04:04 +05:30
Sivin VargheseGitHubMuhsin Keloth
 		9e0468cd73 feat: Inbox header actions (Snooze/Delete) (#8858) 
* feat: Inbox header actions (Snooze/Delete)

* chore: Minor fix

* chore: Fix eslint

* Update inboxHotKeys.js

* feat: custom snooze

* Update actions.spec.js

* chore: Clean up

* chore: add snoozed_until to notification end point

* chore: Minor fix

* chore: Minor style fix

* chore:Clean up

* chore: review fixes

* chore: Minor fix

* chore: Adds alert

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
 2024-02-06 08:54:15 +05:30
Nithin David ThomasandGitHub 65e9cee019 feat: Form input component to use with onboarding form (#8850) 
* feat: Form input component to use with onboarding form

* Update Input.vue

* Update WithLabel.vue

* Review fixes
 2024-02-05 10:17:06 -08:00
Nithin David ThomasGitHubShivam Mishra
 		bb3851a35c feat: Wizard step component to use with onboarding (#8854) 
* feat: Wizard step component to use with onboarding

* Update app/javascript/v3/views/onboarding/OnboardingStep.vue

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>

* Update app/javascript/v3/views/onboarding/OnboardingStep.vue

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>

* Update app/javascript/v3/views/onboarding/OnboardingStep.vue

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>

* Review fixes

---------

Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
 2024-02-05 09:34:33 -08:00
Nithin David ThomasandGitHub 4368bdb2bc feat: Form select component to use with onboarding form (#8852) 
* feat: Form select component to use with onboarding form

* Update Select.vue

* Update WithLabel.vue
 2024-02-05 09:19:44 -08:00
Sojan JoseandGitHub 1b753720c1 chore: Move Enterprise pricing validation to on create (#8856) 
* chore: Move Pricing validation to on create

The previous validation was getting triggered on all transactions,
this would prevent login to existing users and session data need to be updated.
Opting for a less intrusive approach.

* chore: minore change
 2024-02-05 19:18:29 +05:30
Muhsin KelothandGitHub 39e27d2a23 feat: Delete all/read notifications (#8844) 2024-02-05 13:33:05 +05:30
Sivin VargheseandGitHub 45e630fc60 feat: Inbox list display menu (#8847) 
* feat: Inbox list display menu

* chore: Fix alignment
 2024-02-04 10:23:16 +05:30
Shivam MishraGitHubPranav Raj S
 		0c35a77d4b feat: Show a confirmation banner if the email is not verified (#8808) 
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
 2024-02-02 12:31:29 -08:00
Shivam MishraGitHubMuhsin Keloth
 		07ea9694a3 feat: new accounts controller for signup+onboarding (#8804) 
* feat: add v2 accounts controller

* feat: allow empty account and user name

* feat: ensure  and  is present for v1 signup

* test: remove validation checks

* chore: apply suggestions

* chore: revert en.yml formatting

* chore: line at EOF

* fix: routes

---------

Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
 2024-02-02 16:10:45 +05:30
Sivin VargheseandGitHub 85043e7d88 feat: Inbox page view (#8841) 2024-02-02 12:45:07 +05:30
Muhsin KelothGitHubSivin Varghese
 		d3c1fce761 feat: Inbox item actions (#8838) 
* feat: Inbox item actions

* feat: add inbox id in push event data

* Update InboxList.vue

* feat: complete actions

* Update InboxList.vue

* Update InboxView.vue

* chore: code cleanup

* chore: fix specs

---------

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
 2024-02-02 11:58:47 +05:30
Pranav Raj SGitHubSojan
 		33e98bf61a fix: Use BODY.PEEK[HEADER] to avoid parsing issues with mail providers (#8833) 
Co-authored-by: Sojan <sojan@pepalo.com>
 2024-02-01 17:24:59 -08:00
Nithin David ThomasandGitHub cae7cb7002 fix: Fixes overlapping issue with local selector dropdown in portal header (#8839) 2024-02-01 03:46:55 -08:00
Vishnu NarayananGitHubSojan
 		b8047f0912 feat: sla-2 add automation backend support for SLA (#8775) 
* feat: add automation support for SLA

* feat: add sla action in automtion UI

* chore: revert frontend changes

* chore: refactor to ee namespace

* chore: refactor automation rule to ee namespace

* feat: create applied_sla table entry

* chore: add applied_sla spec

* chore: rubocop fixes

---------

Co-authored-by: Sojan <sojan@pepalo.com>
 2024-02-01 15:42:12 +05:30
PabloandGitHub de98e434d6 chore: Update year in LICENSE (#8835) 
Update year in LICENSE
 2024-02-01 15:37:05 +05:30