Resolve merge conflicts in PR #12: Dependabot security fixes#14

Merged

granatonatalia merged 12 commits intomasterfrom

copilot/resolve-merge-conflicts

Jan 8, 2026

Commits on Jan 8, 2026

Initial plan
Copilot
committed
Initial analysis and plan for fixing 4 Dependabot security vulnerabilities

Copilot
and
granatonatalia
committed
Implement security fixes: CSP, security audit utility, xlsx→exceljs migration, axios/form-data overrides

Copilot
and
granatonatalia
committed
Fix TypeScript build errors by pinning compatible type definitions

Copilot
and
granatonatalia
committed
Address code review feedback: remove optional chaining and document CSP limitations

Copilot
and
granatonatalia
committed
Resolve merge conflicts with master branch

Copilot
and
granatonatalia
committed
Fix TypeScript error: add optional chaining to eachCell method

Copilot
and
granatonatalia
committed
Resolve merge conflicts with updated master branch (PRs #9-#13)

Copilot
and
granatonatalia
committed
Resolve merge conflicts (third iteration) - maintain type overrides and optional chaining

Copilot
and
granatonatalia
committed
Initial plan
Copilot
committed
Resolve merge conflicts with master (fourth iteration)
Copilot
committed
Merge PR branch with resolved conflicts
Copilot
committed