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 |
||
|---|---|---|
| .. | ||
| account | ||
| audit | ||
| concerns | ||
| account_user.rb | ||
| account.rb | ||
| activity_message_handler.rb | ||
| application_record.rb | ||
| audit_log.rb | ||
| automation_rule.rb | ||
| channelable.rb | ||
| conversation.rb | ||
| inbox_agent_availability.rb | ||
| inbox.rb | ||
| message.rb | ||