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

871 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sojan
3823ad8fef Merge branch 'master' into develop 2020-06-10 00:25:52 +05:30
Sojan
04a0aa5f1b BugFix: Fix twitter DM view 
- Fix twitter DMs gettings getting appended to tweet conversation

Fixes: #939
 2020-06-10 00:25:05 +05:30
Sojan
991648edcf Merge branch 'hotfix/1.5.2' 2020-06-10 00:24:12 +05:30
Sojan
bfe10618fb BugFix: Fix twitter DM view 
- Fix twitter DMs gettings getting appended to tweet conversation

Fixes: #939
 2020-06-10 00:23:34 +05:30
Pranav Raj S
eadc33d230
Use empty string as fallback greeting_message if null (#948) 2020-06-10 00:16:34 +05:30
Sojan Jose
432dad203b
Feature: Inbox greeting message (#927) 
Co-authored-by: Pranav Raj S <pranav@thoughtwoot.com>
 2020-06-09 23:54:35 +05:30
Sojan Jose
8b022311c0
Chore: FCM Push Fixes (#934) 2020-06-09 17:42:18 +05:30
Pranav Raj S
40481f6462
Bugfix: Update conversation counters in realtime (#944) 
* Bug: Update conversation counters in realtime
 2020-06-09 16:26:33 +05:30
Pranav Raj S
602132119b
Fix socket reconnect if the pubsub token is same (#942) 2020-06-08 19:13:33 +05:30
Sojan Jose
52d28105e4
Chore: Remove dead code related to billing (#935) 
- remove subscription model
- remove billing-related code
 2020-06-07 20:31:48 +05:30
Sojan Jose
051871a3cd
Chore: Code Cleanup in API controllers (#932) 
* Chore: Code Cleanup in API controllers

* Remove unnecessary scoping for accounts controller
 2020-06-07 13:58:05 +05:30
Sojan Jose
3d84568a37
Feature: Label APIs (#931) 2020-06-07 11:17:13 +05:30
Sojan Jose
915eefdc36
Bugfix: FCM push subscription builder fix (#930) 2020-06-06 20:53:30 +05:30
dependabot[bot]
ede4dd9cb0
Chore: Bump websocket-extensions from 0.1.3 to 0.1.4 (#929) 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-06 18:56:58 +05:30
dependabot[bot]
b7f7b54f9b
Chore: Bump websocket-extensions from 0.1.4 to 0.1.5 (#928) 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-ruby) from 0.1.4 to 0.1.5.
- [Release notes](https://github.com/faye/websocket-extensions-ruby/releases)
- [Changelog](https://github.com/faye/websocket-extensions-ruby/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-ruby/compare/0.1.4...0.1.5)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-06-06 15:56:54 +05:30
Sojan Jose
a13a474c23
Chore: Firebase Cloud Messaging Support (#858) 2020-06-05 00:15:50 +05:30
Sojan
e783c3af5d Merge branch 'release/1.5.1' 2020-06-04 23:15:08 +05:30
Sojan Jose
68be7e3ea8
Use db:prepare instead of db:migrate (#924) 
Use db:prepare instead of db:migrate

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
 2020-06-04 23:13:10 +05:30
Koichi MATSUMOTO
72a25ffdc5
BugFix: Fix undefined method compare_and_save (#921) 
Fix undefined method `compare_and_save` in config loader
 2020-06-04 22:33:10 +05:30
Sojan
89dafa366e Merge branch 'release/1.5.0' 2020-06-02 23:53:19 +05:30
Sojan Jose
dafabac796
Chore: Minor bugfixes and housekeeping tasks (#896) 2020-06-02 23:50:39 +05:30
Sojan Jose
93d8a25877
Enable Spanish (#913) 2020-06-02 23:43:03 +05:30
Pranav Raj S
f78df91dd2
Chore: Contact Sidebar, conversation cleanup (#908) 
- Update sidebar design
- Move every contact data to contacts module
- Revert go to next conversation feature
- Fix issues with new conversation in action cable
- Escape HTML content
- Broadcast event when conversation.contact changes.

Co-authored-by: Sojan <sojan@pepalo.com>
 2020-06-02 22:59:02 +05:30
Sojan Jose
8c52a3a953
Chore: Remove duplication of user JBuilder (#911) 
* Chore: Reduce duplication of user JBuilder
 2020-05-31 23:10:20 +05:30
Pranav Raj S
d4783db6fd
Chore: Update app logo, add FRONTEND_URL env var (#910) 
Chore: Update app logo, add FRONTEND_URL env var
 2020-05-31 21:49:28 +05:30
Pranav Raj S
586c616ae3
Bug: Render header title and tagline as HTML (#906) 
* Render header title and tagline as HTML
 2020-05-31 16:35:10 +05:30
Pranav Raj S
884a1c5971
Chore: Add an option to upload a business logo to inbox (#905) 
Chore: Add an option to upload a business logo to inbox
 2020-05-31 16:16:22 +05:30
Pranav Raj S
47ec7ad7c9
Feature: Ability to customise widget color (#903) 
- Use Chrome style color-picker
 2020-05-30 17:28:00 +05:30
Pranav Raj S
ec197b077d
Chore: Add db migrate to Heroku release phase (#901) 2020-05-29 14:53:27 +05:30
Ronald Walker
10a1758261
Bug: Fix false positive in #toggleAgentTypingStatus spec (#899) 2020-05-29 12:37:18 +05:30
dependabot[bot]
a9d93b750c
Chore: Bump kaminari from 1.2.0 to 1.2.1 (#898) 
Bumps [kaminari](https://github.com/kaminari/kaminari) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/kaminari/kaminari/releases)
- [Changelog](https://github.com/kaminari/kaminari/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kaminari/kaminari/compare/v1.2.0...v1.2.1)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-05-29 11:14:27 +05:30
Pranav Raj S
efc59bb43f
Bug: Fix account_id in URLs (#894) 
* Bug: Fix account_id in URLs
* Fix accountMixin specs
 2020-05-26 23:36:42 +05:30
Sojan Jose
b7a583b2c4
Feature: Ability to switch between multiple accounts (#881) 
* Feature: Ability to switch between multiple accounts

* Fix rubocop

* Fix assigned inboxes

* fix auth json

* Add account switcher in UI

* fix ordering on administrate

* Add switch accounts to sidebar

* add account id

* Fix schema.rb timestamp

* Revert "add account id"

This reverts commit 27570f50ef584cb9a5f69454f43f630b318c8807.

* Add a check for account

Co-authored-by: Pranav Raj Sreepuram <pranavrajs@gmail.com>
 2020-05-26 22:38:48 +05:30
Abdulkadir Poyraz
b1aab228ae
Feature: Ability to mute contacts (#891) 
fixes: #867
 2020-05-26 17:43:59 +05:30
Sojan Jose
d8d14fc4a4
Feature: Rewamp super admin dashboard (#882) 2020-05-24 22:44:26 +05:30
dependabot[bot]
e49a200ee0
Chore: Bump puma from 4.3.4 to 4.3.5 (#890) 
Bumps [puma](https://github.com/puma/puma) from 4.3.4 to 4.3.5.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/commits)

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-05-23 14:21:13 +05:30
Jean Traullé
8ccc00b5ba
Add crowdin badge on README.md (#889) 2020-05-22 19:59:26 +05:30
Sony Mathew
6230f4d796
Enhancement: Threaded email replies for a conversation (#885) (#886) 
* Added custom Message-ID and In-Reply-To headers for conversation reply emails
* Added new global config for the default domain (This is used in the above headers)
* Added migration to run the config loader to load the new global config value
* The subject of the conversation reply mailer was made static (This is required for threaded emails)
* Added required tests
 2020-05-22 18:14:18 +05:30
Sony Mathew
11b4b4ea3f
Chore: Parse quoted text in incoming emails (#883) (#884) 
* Chore: Parse quoted text in incoming emails (#883)
* Parsed the quoted text and replies in incoming emails and store them separately
* Did this parsing for plain text and html part of emails
* In the chat window, we will only show the parsed reply alone

* Conversation mailbox test fixes (#883)
 2020-05-22 18:07:06 +05:30
Sony Mathew
00093fa408
Fixed rspec due to unescaped html check for user name (#887) (#888) 
* Fixed the flaky failure in rspec for super admin user controller due to unescaped user name check
 2020-05-22 17:58:08 +05:30
Sojan Jose
f6a9f791cf
Chore: Configure Letter opener with environment variable (#880) 2020-05-20 20:02:28 +05:30
Pranav Raj S
8af200ad20
Fix missing translations, enable dutch language (#878) 
* Fix missing translations, enable dutch language
 2020-05-19 19:05:10 +05:30
Pranav Raj S
3f5ce2ddbf
Bug: Fix autoload_paths for facebook bot (#877) 
* Fix autoload_paths for facebook bot
 2020-05-18 15:32:26 +05:30
Pranav Raj S
6e92d9be9e
Bug: Fix Facebook v7.0 API issues (#863) 
* Fix v7.0 API issues

Co-authored-by: Sojan <sojan@pepalo.com>
 2020-05-17 23:44:50 +05:30
Pranav Raj S
b7129785c6
Chore: View form responses as user messages (#876) 
* Chore: View form responses as user messages
 2020-05-17 22:49:45 +05:30
Pranav Raj S
246d0b407f
Chore: UI Cleanup in modals (#873) 
* Chore: UI Cleanup in modals

* Fix review comments
 2020-05-17 21:07:45 +05:30
Pranav Raj S
59f4dd7ebe
Feature: Introduce locale in web-widget SDK (#871) 
* Introduce setLocale in SDK

Co-authored-by: Sojan <sojan@pepalo.com>
 2020-05-17 16:15:53 +05:30
Sojan Jose
2e8cd59a06
Add new translations (#862) 
* New translations agentMgmt.json (Dutch)

* New translations login.json (Dutch)

* New translations settings.json (French)

* New translations en.json (French)

* New translations en.json (Arabic)

* New translations en.json (Greek)

* New translations settings.json (Portuguese, Brazilian)

* New translations settings.json (Dutch)

* New translations settings.json (Greek)

* New translations signup.json (Ukrainian)

* New translations chatlist.json (Dutch)

* New translations contact.json (Dutch)

* New translations billing.json (Dutch)

* New translations cannedMgmt.json (Dutch)

* New translations inboxMgmt.json (Dutch)

* New translations conversation.json (Dutch)

* New translations generalSettings.json (Dutch)

* New translations en.json (Dutch)

* New translations en.json (Portuguese, Brazilian)

* New translations devise.en.yml (Dutch)

* New translations en.yml (Dutch)
 2020-05-16 18:07:19 +05:30
Pranav Raj S
467fcda6fc
Chore: Add docs for push notifications env (#865) 2020-05-15 12:15:28 +05:30
Sojan Jose
e6aa851987
Chore: Add Account Users to Admin Panel (#859) 
- Show errors on login page
- Dashboard for admin panel
 2020-05-14 22:51:51 +05:30