gabrieljablonski 112385fd9e Merge branch 'main' into chore/merge-4.13.0 ... Resolves 26 conflicts via manual review. Key decisions: - signature: kept fork's send-time architecture (PR #79), discarded upstream's editor-manipulation functions - WhatsApp incoming: combined fork's two-layer locking (source_id + contact phone) with upstream's blocked-contact drop. Fixed pre-existing regression where echoes were silently dropped - InstallationConfig: upstream's simplified coder (validated against legacy YAML-in-jsonb data) - schema.rb: regenerated, stripped kanban tables from other branches, restored f_unaccent SQL function		2026-04-17 16:23:47 -03:00
..
api	Merge branch 'main' into chore/merge-4.13.0	2026-04-17 16:23:47 -03:00
auth	feat: ensure signup verification [UPM-14] (#13858)	2026-04-07 13:45:17 +05:30
concerns	feat: notion OAuth setup (#11765)	2025-06-26 19:16:06 +05:30
devise	chore: rotate oauth password if unconfirmed (#13878)	2026-04-02 11:26:29 +05:30
devise_overrides	fix: Session controller to not generate auth tokens before mfa verification (#12487)	2025-09-23 19:13:47 +05:30
google	refactor: use state-based authentication (#11690)	2025-06-18 17:39:06 +05:30
instagram	feat: Instagram Inbox using Instagram Business Login (#11054)	2025-04-08 10:47:41 +05:30
installation	chore: Enable the new Rubocop rules (#7122)	2023-05-19 14:37:10 +05:30
linear	feat(linear): Support refresh tokens and migrate legacy OAuth tokens (#13721)	2026-03-17 13:09:03 +04:00
microsoft	refactor: use state-based authentication (#11690)	2025-06-18 17:39:06 +05:30
notion	feat: notion OAuth setup (#11765)	2025-06-26 19:16:06 +05:30
platform/api/v1	feat(platform): Add email channel migration endpoint for bulk OAuth channel creation (#13902)	2026-03-25 15:58:08 -07:00
public/api/v1	Merge branch 'main' into chore/merge-4.13.0	2026-04-17 16:23:47 -03:00
service	chore: Update dependencies to the latest versions (#5033)	2022-07-15 09:51:59 +07:00
shopify	fix: shopify and leadsquared specs in ci (#12926)	2025-11-21 17:01:03 +05:30
super_admin	Merge branch 'chatwoot/develop' into chore/merge-upstream-4.12.0	2026-03-20 00:27:45 -03:00
tiktok	feat: TikTok channel (#12741)	2025-12-17 07:54:50 -08:00
twilio	chore: Move Twilio event processing to background job (#11094)	2025-03-15 13:51:08 -07:00
twitter	chore: Enable the new Rubocop rules (#7122)	2023-05-19 14:37:10 +05:30
webhooks	Merge branch main into chore/merge-upstream	2025-12-20 12:44:31 -03:00
.keep	Fix url in emails, add frontendURL helper (#19)	2019-08-25 19:59:28 +05:30
android_assetlinks_spec.rb	chore: Universal Linking for Android (#2324)	2021-06-02 08:46:45 -07:00
api_controller_spec.rb	feat: add chatwoot instance status in superadmin (#6045)	2023-01-30 18:37:51 +05:30
apple_app_spec.rb	chore: Configure iOS universal linking (#10651)	2025-01-08 21:25:11 +05:30
dashboard_controller_spec.rb	fix: Avoid throwing 406 for non-json requests (#11701)	2025-06-10 15:12:32 -04:00
health_controller_spec.rb	chore: general improvements (#232)	2026-03-03 14:08:56 -03:00
microsoft_controller_spec.rb	fix: Identity JSON response header (#6326)	2023-02-02 11:01:18 +05:30
slack_uploads_controller_spec.rb	fix: Set avatar for users(agent/contact) in slack channels (#7960)	2023-09-26 09:38:14 +05:30
swagger_controller_spec.rb	Chore: Swagger Docs V1 (#546)	2020-02-23 12:54:29 +05:30
widget_tests_controller_spec.rb	[Feature] Email collect message hooks (#331)	2020-01-09 13:06:40 +05:30
widgets_controller_spec.rb	chore: Enable the new Rubocop rules (#7122)	2023-05-19 14:37:10 +05:30