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 |
||
|---|---|---|
| .. | ||
| ContactLabels | ||
| ContactsCard | ||
| ContactsForm | ||
| ContactsHeader | ||
| ContactsSidebar | ||
| EmptyState | ||
| Pages | ||
| ContactsDetailsLayout.vue | ||
| ContactsListLayout.vue | ||
| ContactsLoadMore.vue | ||
| VoiceCallButton.vue | ||