mirror of
https://github.com/ether/etherpad-lite.git
synced 2026-07-22 17:46: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). |
||
|---|---|---|
| .. | ||
| backend-tests.yml | ||
| build-and-deploy-docs.yml | ||
| codeql-analysis.yml | ||
| deb-package.yml | ||
| dependency-review.yml | ||
| docker.yml | ||
| frontend-admin-tests.yml | ||
| frontend-tests.yml | ||
| handleRelease.yml | ||
| installer-test.yml | ||
| load-test.yml | ||
| perform-type-check.yml | ||
| rate-limit.yml | ||
| release.yml | ||
| releaseEtherpad.yml | ||
| snap-build.yml | ||
| snap-publish.yml | ||
| stale.yml | ||
| update-plugins.yml | ||
| upgrade-from-latest-release.yml | ||