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

648 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tim Lange
a2316d4d09
Chore: Added tests for subscriptions_controller (#483) 
Added tests for subscriptions_controller
ref: #37
 2020-02-17 07:51:45 +05:30
Pranav Raj S
c32d391261
Bug: Fix imports in ProfileSettings (#506) 2020-02-16 22:20:59 +05:30
Pranav Raj S
c4e2a84f65
Feature: Agent Profile Update with avatar (#449) 
* Feature: Agent Profile Update with avatar
* Add Update Profile with name, avatar, email and password
 2020-02-16 17:20:38 +05:30
Nithin David Thomas
e61ba95cf7
Feature: Add/Edit conversation labels (#488) 
Co-authored-by: Pranav Raj S <pranavrajs@gmail.com>
 2020-02-16 15:46:26 +05:30
Sojan Jose
77473dc2aa
Chore: Include avatar url in sign_in response (#501) 
- include avatar url in sign_in response ( fixes #500 )
- fix circle ci builds
 2020-02-15 22:57:48 +05:30
Subin T P
eb5185974a
Monitoring: Add Scout APM (#487) 
* Add scout APM
 2020-02-15 04:22:36 +05:30
Subin T P
919261d843
Feature: Webhooks (#489) 2020-02-14 23:19:17 +05:30
sony-mathew
79a847aeab Merge branch 'hotfix/1.1.3' into develop - Bug Fix : Adjusted the connection pool size and concurrency for Sidekiq 2020-02-11 22:59:07 +05:30
sony-mathew
301b1829bc Merge branch 'hotfix/1.1.3' - Bug Fix : Adjusted the connection pool size and concurrency for Sidekiq 2020-02-11 22:58:43 +05:30
sony-mathew
6645d7f80b Bug Fix : Adjusted the connection pool size and concurrency for Sidekiq 2020-02-11 22:58:19 +05:30
sony-mathew
baf1a6e8da Merge branch 'hotfix/1.1.3' into develop - Bug Fix : Increased the connection pool size and concurrency for Sidekiq 2020-02-11 21:52:37 +05:30
sony-mathew
1e955455f0 Merge branch 'hotfix/1.1.3' Bugfix : Increased sidekiq connection pool and concurrency 2020-02-11 21:51:46 +05:30
sony-mathew
fdbad7c5d8 Bug Fix : Increased the connection pool size and concurrency for Sidekiq 2020-02-11 21:50:38 +05:30
Sojan
2023d5d42b Revert "Updates sidebar on dashboard" 
This reverts commit 6186d14593.
 2020-02-11 19:34:42 +05:30
Nithin David
6186d14593 Updates sidebar on dashboard 2020-02-11 19:21:55 +05:30
Pranav Raj S
30f4c08143
Feature: SignIn with Twitter (#479) 
* Add Twitter SignIn flow

Co-authored-by: Sojan Jose <sojan@pepalo.com>
 2020-02-11 14:27:38 +05:30
Pranav Raj S
272c481464
Feature: Create conversations from Tweets (#470) 
* Feature: Add tweets to conversations
 2020-02-09 15:47:48 +05:30
Tim Lange
3465ebefd1 Chore: Added tests for assignments_controller (#482) 2020-02-08 23:48:00 +05:30
Tim Lange
b9836309fb
Chore: Added tests for agents_controller (#481) 2020-02-08 23:05:41 +05:30
Tim Lange
6c46891ee1
Chore: Remove unnessecary check if object exists (#480) 2020-02-08 22:38:37 +05:30
Tim Lange
67e41092e6
Chore: Added tests for inbox_members (#478) 2020-02-08 13:21:41 +05:30
Tim Lange
1d269f4e8d
Chore: Added tests for canned_responses (#477) 2020-02-08 11:58:40 +05:30
Tim Lange
37289fbd63
Chore: Increase test coverage for conversations controller (#476) 2020-02-07 21:43:51 +05:30
Tim Lange
a30a8867a3
Chore: Increase test coverage for accounts controller (#475) 2020-02-07 16:41:49 +05:30
Tim Lange
5210d201b6
Chore: Increase test coverage for widgets controller (#473) 2020-02-07 13:14:07 +05:30
Vishnu Narayanan
3eb5b3a0c1
docs: Update contribution guidelines (#471) (#474) 2020-02-07 12:05:09 +05:30
Tim Lange
3fa7c605c3
Chore: Increase test coverage for widget messages (#472) 2020-02-07 00:51:47 +05:30
Pranav Raj S
7b1fdc5fcd
BugFix: Filter duplicate DMs in Twitter Integration (#468) 
BugFix: Filter duplicate DMs in Twitter Integration
 2020-02-05 18:50:37 +05:30
Pranav Raj S
607fc25723
Bugfix: Fix copy in agent availability status (#466) 
Copy update for agent status
 2020-02-05 12:11:33 +05:45
Nithin David Thomas
83b0bb4062
Feature: As an end-user, I should be able to see the list of agents in the widget. (#461) 
Co-authored-by: Pranav Raj S <pranavrajs@gmail.com>
 2020-02-05 11:27:22 +05:30
Pranav Raj S
33e0bd434b
Chore: Update the copy used in signup page (#464) 
Co-authored-by: Sojan Jose <sojan@pepalo.com>
 2020-02-03 20:12:37 +05:45
Sojan
002463aede Merge branch 'hotfix/1.1.2' into develop 2020-02-03 14:33:53 +05:45
Sojan
f1613f4a0d Merge branch 'hotfix/1.1.2' 2020-02-03 14:33:43 +05:45
Sojan
1aebdc63d5 Fix coverage issue with codeclimate 2020-02-03 14:29:03 +05:45
Sojan
8d6f9cad05 Merge branch 'hotfix/1.1.1' into develop 2020-02-03 14:14:39 +05:45
Sojan
03a46d0cfe Merge branch 'hotfix/1.1.1' 2020-02-03 14:14:29 +05:45
Sojan
067411b5b6 Fix heroku deploy and docker image issues 
#458
#459
 2020-02-03 14:02:32 +05:45
Sojan
cf56b9560d Merge branch 'release/1.1.0' 2020-02-03 01:01:03 +05:45
Pranav Raj S
a9c304f1ef
Feature: Twitter DM Integration (#451) 
An initial version of twitter integration

Co-authored-by: Sojan Jose <sojan@pepalo.com>
 2020-02-03 00:54:00 +05:45
Sojan Jose
a287c86bc4
Bugfix: Fix password reset (#455) 2020-02-02 22:52:38 +05:30
Pranav Raj S
0b31e14132
Feature: Add online status to each user (#452) 
* Feature: Add online status to each user
* Add OnlineStatusable, add availability status to thumbnail
 2020-02-02 22:49:16 +05:45
Pranav Raj S
1f4703d25d
Chore: Disable brakeman in Codeclimate (#453) 2020-02-02 17:35:03 +05:30
Subin T P
b3264a0d7b
Feature: API to get most used labels (#447) 
* Add most-used labels API

* Filter conversation by labels

* Move match_all to any query

Co-authored-by: Pranav Raj S <pranavrajs@gmail.com>
 2020-02-02 16:29:18 +05:30
Sojan Jose
199642d3bd Chore: Render avatar url in validate token method (#448) 2020-01-27 00:59:51 +05:45
Anto Dominic
6325acd183 Feature: Add Sidekiq docker (#443) 
* update db:schema due to migration

* reduce default concurrency for redis connection limit

* Allow auto update packages in the development mode without building image

* add sidekiq support to docker-compose

* Pass sidekiq cofig file

* passed the env file in base image rather than separately in rails, web packer and sidekiq in docker-compose
* removed un-necessary changes in schema
* changed concurrency to finer values
* removed default size set in sidekiq redis config
* Added the sidekiq config option in Procfile.dev

Co-authored-by: Sony Mathew <ynos1234@gmail.com>
 2020-01-27 00:15:13 +05:45
sony-mathew
8cf135f2db Merge branch 'hotfix/1.0.3' into develop 
# Conflicts:
#	config/cable.yml
#	docs/development/environment-setup/docker.md
 2020-01-26 22:51:39 +05:45
sony-mathew
6efa994096 Merge branch 'hotfix/1.0.3' - Support for authenticated redis connections 2020-01-26 22:47:00 +05:45
sony-mathew
2168f823a5 [#446] Redis authentication support 
Previously we did not support authentication for redis anywhere. Also in the docker compose we were exposing redis port 6379 without any authentication. In the app side for the connections that app server (for storing keys as well as for socket connections made using action cable) and Sidekiq were making to redis server did not support authentication.

With this commit, we support authentication for redis connections from app side and Sidekiq. This is supported in docker-compose as well.

The changes include :
* Added support for new env variable REDIS_PASSWORD
* This redis password is now supported by action cable connections, Sidekiq connections and app side redis connections
* Since Sidekiq did not have an initializer, added an initializer to pass custom config to Sidekiq (for now it's options for redis)
* Changes in docker-compose to pickup a password set in .env file to protect the redis server running in docker
* Added necessary documentation changes in `docker.md` and `environment-variables.md`
 2020-01-26 22:46:34 +05:45
Sony Mathew
1fd4127709
Removed agent dashboard link in conversation mail to user (#445) 2020-01-24 14:31:52 +05:45
Sony Mathew
04d347f0ee Chore: Changed from email and reply to email for conversation email (#444) 2020-01-24 14:10:52 +05:45