112385fd9e
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 |
||
|---|---|---|
| .. | ||
| campaigns | ||
| csat_surveys | ||
| messages | ||
| v2 | ||
| account_builder.rb | ||
| agent_builder.rb | ||
| contact_inbox_builder.rb | ||
| contact_inbox_with_contact_builder.rb | ||
| conversation_builder.rb | ||
| notification_builder.rb | ||
| notification_subscription_builder.rb | ||
| year_in_review_builder.rb | ||