mirror of
https://github.com/ether/etherpad-lite.git
synced 2026-07-18 00:57:55 +00:00
5afd466bba
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). |
||
|---|---|---|
| .. | ||
| 2026-04-18-gdpr-pr1-deletion-controls-design.md | ||
| 2026-04-18-gdpr-pr2-ip-privacy-audit-design.md | ||
| 2026-04-19-gdpr-pr3-anon-identity-design.md | ||
| 2026-04-19-gdpr-pr4-privacy-banner-design.md | ||
| 2026-04-19-gdpr-pr5-author-erasure-design.md | ||
| 2026-04-20-issue-7570-ueberdb2-drivers-design.md | ||
| 2026-04-25-auto-update-design.md | ||
| 2026-04-25-auto-update-runbook.md | ||
| 2026-04-30-issue-7599-open-graph-metadata-design.md | ||
| 2026-05-01-issue-7638-admin-typesafe-api-design.md | ||
| 2026-05-03-gdpr-admin-author-erasure-ui-design.md | ||
| 2026-05-08-issue-7693-admin-openapi-design.md | ||
| 2026-05-08-native-docx-pdf-export-import-design.md | ||
| 2026-05-09-admin-settings-parsed-view-design.md | ||
| 2026-05-10-openapi-cleanup-design.md | ||
| 2026-05-15-issue-7524-swagger-ui-telemetry-design.md | ||
| 2026-05-18-admin-settings-resolved-runtime-design.md | ||
| 2026-05-18-issue-7802-url-base-path-support-design.md | ||
| 2026-05-18-outdated-notice-redesign-design.md | ||
| 2026-05-25-esm-plugin-compat-design.md | ||