mirror of
https://github.com/ether/etherpad-lite.git
synced 2026-07-18 00:57:55 +00:00
Conflicts resolved in 10 files. All updater/hook files kept develop's new logic (LRUCache per-key badge caching, firstAuthorOf/resolveRequestAuthor, maintenanceWindow tier-4 support, node-engine-mismatch preflight check, smtpTransportKey/notifyApplyFailure, isMinorOrMoreBehind replacing isMajorBehind/isVulnerable, removed vulnerableBelow machinery). Import style: branch ESM shape preserved throughout — .js extensions kept on all local imports, require() calls in develop converted to ESM import statements (ImportEtherpad.ts, ImportHtml.ts, pad.ts). pad.ts imports pad_outdated_notice.js (new) instead of pad_version_badge.js (removed). All vitest test files taken from develop as-is (no mocha shape introduced). |
||
|---|---|---|
| .. | ||
| plans | ||
| specs | ||