KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2709 commits 168 branches 82 tags 79 MiB
Commit graph

2709 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nithin David Thomas
022d0b0ea3
chore: Enable prototyping classes for foundation (#5945) 
* chore: Enable prototyping classes for foundation

* Marcros css clean up

* Imports utilities separately

* Fix macro position

* Changes global margin

Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
 2022-12-19 14:11:11 +05:30
Sivin Varghese
3406e3d0ab
Merge branch 'feat/5913-search-improvements' into feat-new-search-ui 2022-12-19 14:01:12 +05:30
Tejaswini Chile
9cbb3bee6b
Merge branch 'develop' into feat/5913-search-improvements 2022-12-19 14:00:09 +05:30
fayazara
35f653c460 Revert z index change 2022-12-19 13:54:54 +05:30
fayazara
f328489068 review changes 2022-12-19 13:52:45 +05:30
Fayaz Ahmed
812c84e2b1
Merge branch 'feat/5913-search-improvements' into feat-new-search-ui 2022-12-19 13:52:16 +05:30
Tejaswini Chile
5088df4c5b fix: update inbox details for text search json 2022-12-19 13:49:54 +05:30
Tejaswini Chile
03ba2fa0ce fix: update inbox details for text search json 2022-12-19 13:35:53 +05:30
fayazara
a669842fb3 Show conversation meta on message item 2022-12-19 13:33:42 +05:30
Tejaswini Chile
5541d9e00b
Fix: automation email improvement (#6061) 2022-12-19 13:21:33 +05:30
Sivin Varghese
51d48d99e4
Merge branch 'feat/5913-search-improvements' into feat-new-search-ui 2022-12-19 10:52:09 +05:30
Tejaswini Chile
ff8c0654c0
Merge branch 'develop' into feat/5913-search-improvements 2022-12-18 21:07:27 +05:30
Pranav Raj S
38587b3aa1
fix: Update Slack integration to fix message delivery issues (#6093) 2022-12-17 16:41:11 -08:00
Pranav Raj S
4d2b7c37a0
feat: Display labels in the conversation card (#6088) 
Co-authored-by: Nithin David Thomas <webofnithin@gmail.com>
 2022-12-17 13:11:28 -08:00
Pranav Raj S
aaacf9d4d2
feat: Allow users to disable marking offline automatically (#6079) 
Co-authored-by: Nithin David <1277421+nithindavid@users.noreply.github.com>
 2022-12-16 11:59:27 -08:00
Sivin Varghese
82d3398932
fix: Add improvements to the Help Center module (#6081) 2022-12-16 11:41:55 -08:00
Tejaswini Chile
1ba4bed546
Merge branch 'develop' into feat/5913-search-improvements 2022-12-16 18:53:16 +05:30
Tejaswini Chile
0397b5ae54 fix: added the threshold for the multisearch 2022-12-16 18:43:24 +05:30
Tejaswini Chile
30365797c0 fix: message with inbox and agent details 2022-12-16 13:18:07 +05:30
Tejaswini Chile
9c4714b658 fix: added json for agents details in conversation 2022-12-16 13:10:44 +05:30
Tejaswini Chile
a59dc72e68 fix: Conversation to include contacts data 2022-12-16 12:07:10 +05:30
Muhsin Keloth
9106f6278d
fix: Allow editing label and placeholder for standard attributes in pre chat form (#6067) 
Co-authored-by: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
 2022-12-15 09:36:18 -08:00
fayazara
fda2d20010 Review changes 2022-12-15 20:30:18 +05:30
fayazara
364b4fb254 Skip the character limit check if numbers are entered 2022-12-15 19:46:24 +05:30
fayazara
dc19d6da8d Revert commented backend code 2022-12-15 19:41:07 +05:30
fayazara
d082049466 Show messages fullwidth 2022-12-15 19:27:10 +05:30
fayazara
ed8929b55c Fix focusing on firefox 2022-12-15 19:13:41 +05:30
fayazara
785b303166 Limit search characters before making the search request 2022-12-15 19:06:56 +05:30
fayazara
d038a93d65 Truncate long messages 2022-12-15 18:56:26 +05:30
Sojan Jose
f8e6308caf
chore: [Snyk] Fix for 7 vulnerabilities (#6075) 
* fix: Gemfile to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-RUBY-LOOFAH-3168317
- https://snyk.io/vuln/SNYK-RUBY-LOOFAH-3168318
- https://snyk.io/vuln/SNYK-RUBY-LOOFAH-3168649
- https://snyk.io/vuln/SNYK-RUBY-RAILSHTMLSANITIZER-3168316
- https://snyk.io/vuln/SNYK-RUBY-RAILSHTMLSANITIZER-3168646
- https://snyk.io/vuln/SNYK-RUBY-RAILSHTMLSANITIZER-3168647
- https://snyk.io/vuln/SNYK-RUBY-RAILSHTMLSANITIZER-3168648

* chore: update gemlock

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
 2022-12-15 16:40:50 +05:30
Sojan Jose
72fcaa739c
chore: Update translations from Crowdin 2022-12-15 14:11:15 +05:30
smartdev58
9292653bf9
fix: Update enabled_features logic to fix superadmin edit action (#5959) 
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
 2022-12-14 18:24:02 -08:00
smartdev58
2a1a38f986
chore: Add feature flags for campaigns and website channel (#5778) 
Co-authored-by: Tejaswini Chile <tejaswini@chatwoot.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
 2022-12-14 16:06:26 -08:00
Sivin Varghese
2972319026
fix: Update colors in widget buttons to fix invalid colors (#6033) 
Co-authored-by: nithindavid <1277421+nithindavid@users.noreply.github.com>
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
 2022-12-14 15:21:20 -08:00
dependabot[bot]
26e05de642
chore(deps): bump loofah from 2.18.0 to 2.19.1 (#6072) 
Bumps [loofah](https://github.com/flavorjones/loofah) from 2.18.0 to 2.19.1.
- [Release notes](https://github.com/flavorjones/loofah/releases)
- [Changelog](https://github.com/flavorjones/loofah/blob/main/CHANGELOG.md)
- [Commits](https://github.com/flavorjones/loofah/compare/v2.18.0...v2.19.1)

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

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-12-14 12:51:36 -08:00
dependabot[bot]
8222a47154
chore(deps): bump rails-html-sanitizer from 1.4.3 to 1.4.4 (#6074) 
Bumps [rails-html-sanitizer](https://github.com/rails/rails-html-sanitizer) from 1.4.3 to 1.4.4.
- [Release notes](https://github.com/rails/rails-html-sanitizer/releases)
- [Changelog](https://github.com/rails/rails-html-sanitizer/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rails/rails-html-sanitizer/compare/v1.4.3...v1.4.4)

---
updated-dependencies:
- dependency-name: rails-html-sanitizer
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-12-14 12:51:12 -08:00
fayazara
4ac2b31f42 Review changes 2022-12-14 15:13:30 +05:30
fayazara
ea2f265baa Add new search page 2022-12-13 23:15:40 +05:30
Fayaz Ahmed
335ea70169
Merge branch 'develop' into feat/5913-search-improvements 2022-12-13 14:22:51 +05:30
Tejaswini Chile
60bb07923e fix: Added pg_trgm extension 2022-12-13 12:24:51 +05:30
Tejaswini Chile
443dbbbfd2 fix: unwanted changes and the comments 2022-12-13 09:39:05 +05:30
Sivin Varghese
9d78f0d6c6
feat: Adds number validation for WhatsApp inbox at the creation step (#6043) 
Co-authored-by: Nithin David Thomas <1277421+nithindavid@users.noreply.github.com>
 2022-12-12 19:52:37 -08:00
Tejaswini Chile
900e8501ca message json fix 2022-12-12 21:01:09 +05:30
Tejaswini Chile
e00e049fb7
Merge branch 'develop' into feat/5913-search-improvements 2022-12-12 20:13:00 +05:30
Sivin Varghese
86958278cd
fix: Unable to save automation "send email to team" (#6052) 
* fix: Unable to save automation "send email to team"

* chore: Minor fixes
 2022-12-12 20:10:33 +05:30
Tejaswini Chile
acb4b7ce04
Merge branch 'develop' into feat/5913-search-improvements 2022-12-12 14:55:47 +05:30
Tejaswini Chile
02148c5c64 fix: issue with current account not being present for some user 2022-12-12 13:16:27 +05:30
Tejaswini Chile
b456cec6a6 fix: migration for rebuilding multi model search 2022-12-12 11:57:01 +05:30
Tejaswini Chile
abbaeb7701 fix: specs 2022-12-12 11:12:29 +05:30
Tejaswini Chile
6e9a29ef56 fix: JSON format 2022-12-12 00:37:12 +05:30