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 |
||
|---|---|---|
| .. | ||
| integrations | ||
| base_controller.rb | ||
| campaigns_controller.rb | ||
| configs_controller.rb | ||
| contacts_controller.rb | ||
| conversations_controller.rb | ||
| direct_uploads_controller.rb | ||
| events_controller.rb | ||
| inbox_members_controller.rb | ||
| labels_controller.rb | ||
| messages_controller.rb | ||