Sojan Jose f71980bd95 chore: Enhance contact merge action for identified users (#4886) ...

- Discard conflicting keys 
- Do not merge if there is already an identified contact

Co-authored-by: Pranav Raj S <pranav@chatwoot.com>

2022-06-23 15:48:56 +05:30

..

environments

chore: Use different files for widget and dashboard audio alert (#4637)

2022-05-06 20:19:36 +05:30

initializers

chore: Enable Ukrainian language (uk) (#4720)

2022-05-23 12:46:17 +05:30

integration

feat: Add Integration hooks UI (#2301)

2021-06-06 16:59:05 +05:30

locales

chore: Fix sentry issues (#4863)

2022-06-15 16:20:19 +05:30

webpack

fix: unable to send audio messages on Telegram (#4493)

2022-05-02 13:14:04 +05:30

app.yml

Bump version to 2.6.0

2022-06-15 12:06:15 +00:00

application.rb

fix: Redis 6 on Heroku breaks ActionCable config (#4269)

2022-03-24 19:25:07 +05:30

boot.rb

Upgrade to rails 6 💎 (#11)

2019-08-19 13:49:57 +05:30

cable.yml

fix: Redis 6 on Heroku breaks ActionCable config (#4269)

2022-03-24 19:25:07 +05:30

database.yml

fix: Specify external db with non-standard port (#2711)

2021-07-28 19:36:51 +05:30

environment.rb

Initial Commit

2019-08-14 15:18:44 +05:30

features.yml

Chore: Migration to enable email channel (#1913)

2021-03-15 19:15:48 +05:30

installation_config.yml

feat: send instagram message after 24 hours (#4698)

2022-05-26 19:05:30 +05:30

newrelic.yml

chore: update newrelic gem to support log forwarding (#4626)

2022-05-05 23:57:55 +05:30

puma.rb

chore: Update puma config as per recommendations (#3640)

2022-05-06 16:38:44 +05:30

rds-ca-2019-root.pem

chore: add aws rds root cert for tls connection (#3812)

2022-02-01 16:01:25 +05:30

routes.rb

chore: Enhance contact merge action for identified users (#4886)

2022-06-23 15:48:56 +05:30

schedule.yml

chore: Update missing packages in yarn.lock (#4627)

2022-05-05 19:29:51 +05:30

secrets.yml

Use secret_key_base from env

2019-08-15 23:08:36 +05:30

sidekiq.yml

chore: Add active_storage_purge queue to Sidekiq (#4322)

2022-03-29 11:43:07 +05:30

spring.rb

🚨Fix Rubocop lint errors

2019-10-20 14:17:26 +05:30

storage.yml

fix: GCS credentials dont need to be parsed as JSON (#1429)

2020-11-27 14:39:25 +05:30

webpacker.yml

chore: Suppress the unnecessary CSRF warning (#2606)

2021-07-14 18:40:24 +05:30