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 |
||
|---|---|---|
| .. | ||
| cache.spec.js | ||
| clipboard.spec.js | ||
| colorHelper.spec.js | ||
| CustomErrors.spec.js | ||
| CustomEventHelper.spec.js | ||
| DateHelper.spec.js | ||
| documentHelper.spec.js | ||
| Emoji.spec.js | ||
| FileHelper.spec.js | ||
| KeyboardHelpers.spec.js | ||
| localStorage.spec.js | ||
| MessageFormatter.spec.js | ||
| MessageTypeHelper.spec.js | ||
| mitt.spec.js | ||
| portalHelper.spec.js | ||
| ReportsDataHelper.spec.js | ||
| sanitizeData.spec.js | ||
| sessionStorage.spec.js | ||
| timeHelper.spec.js | ||
| ValidatorsHelper.spec.js | ||