fix: resolve merge conflicts from develop consolidation#65

Open

Goldokpa wants to merge 63 commits into

mainfrom

fix/resolve-merge-conflicts

Commits on Mar 10, 2026

Commits on Mar 11, 2026

feat(frontend): foundation — App, API client, styles, types, Tailwind config

committed

Commits on Mar 23, 2026

Commits on Mar 25, 2026

feat(api): add Pydantic request/response schemas for API validation

authored and
franchaise
committed
feat(inference): add post-processing module for output filtering

authored and
franchaise
committed
feat(analytics): add carbon stock estimation module

franchaise
and
claude
committed
feat(analytics): add ground truth validation framework

franchaise
and
claude
committed
Merge branch 'feature/api-schemas-postprocess' - Olufemi Taiwo's API schemas and inference postprocessing
franchaise
committed
Merge branch 'feature/analytics-carbon-validation' - Francis Umo's carbon analytics and validation
franchaise
committed

Commits on Mar 28, 2026

feat(api): add request logging and audit middleware

femi23
and
claude
committed
feat(api): add API key authentication with org context

femi23
and
claude
committed
feat(analytics): add statistical testing module

Francis Umo
and
claude
committed
feat(analytics): add impact reporting module

Francis Umo
and
claude
committed
feat(analytics): export all analytics module components

Francis Umo
and
claude
committed
Merge pull request #3 from Climate-Vision/feature/api-middleware-audit
Goldokpa
authored
Merge pull request #4 from Climate-Vision/feature/analytics-statistics
Goldokpa
authored

Commits on Apr 15, 2026

Commits on Apr 19, 2026

feat(api): enforce API key auth with dev bypass, surface is_synthetic flag, add config health validation
femi23
committed
ci: add pytest scaffolding and GitHub Actions workflow
Victor Mbachu
committed
test(models): add UNet and Siamese architecture tests
Godswill-code
committed
docs: add first-time and intermediate contributor issue guides
Goldokpa
committed
fix(frontend): correct case-sensitive import paths for Map components
Victor Mbachu
committed
fix(pipeline): remove unnecessary global declaration causing flake8 F824
femi23
committed
ci: install system deps before pip install (GDAL, OpenGL)
Victor Mbachu
committed
ci: remove redundant gdal pip package and simplify system deps
Victor Mbachu
committed
ci: install package in editable mode for pytest
Victor Mbachu
committed
feat(data): add dataset, augmentation, and synthetic data modules
Victor Mbachu
committed
fix(deps): add email-validator for pydantic EmailStr support
Victor Mbachu
committed

Commits on May 21, 2026

fix: resolve merge conflicts from develop consolidation into main

Goldokpa
and
claude
committed