Commit Graph
14 Commits
Author SHA1 Message Date
Adrian Sbardella 86bd01e02d Merge upstream cable feature ownership fix; preserve independent contribution 2026-11-02 12:33:03 -03:00
Adrian Sbardella ebf0356690 Reconcile upstream alias-hint budget and contribution schema pins
Retain every accepted alias while incorporating #1462's smaller model-facing hints. Recompute the contribution-specific schema pins; all 61 voice/first-run/schema regressions and the current-main token ledger passed.
2026-11-02 12:26:42 -03:00
Adrian Sbardella 28e2516a59 Synchronize latest upstream Bike Share capacity correction
Preserve all contribution changes and incorporate main fb06eab03f. Only the four independent #1447 files differ from the previously validated tree; the shared regression file passed 11 tests.
2026-11-02 12:16:50 -03:00
Adrian Sbardella 0f391576f4 Reconcile #1152 with current upstream while preserving the contribution 2026-11-02 12:09:29 -03:00
Adrian Sbardella 7298a265f3 fix(dams): align Paraguay source attribution and integration counts
Synchronize with upstream main 5d95e9ad. Retain the original Acaray and Yacyreta geometries, use the OpenStreetMap / OpenInfraMap source label, and document standalone and combined dam counts without including the independent NVE or IGN datasets.
2026-10-22 22:09:35 -03:00
Adrian Sbardella 0530aa18f7 Merge upstream main into feat/paraguay-acaray-yacyreta (#1152) 2026-10-21 00:04:17 -03:00
Adrian Sbardella d656d46a44 Merge main 1df2a27 into PR #1152
Include upstream map fallback recovery while retaining the i18n integration and review fixes.
2026-10-16 21:49:47 -03:00
Adrian Sbardella 27001e6bc9 Merge main cc84ab1 and address review feedback for #1152
Preserve i18n integration and validated branch behavior. Published tree matches local validation exactly.
2026-10-16 21:34:45 -03:00
Adrian Sbardella 10d985328f Merge main 3e5a18f into PR #1152 after i18n review fixes 2026-10-16 20:50:55 -03:00
Adrian Sbardella f233477cee Merge main fb10889 into PR #1152
Retain the reviewed i18n/source fixes and current upstream behavior.
2026-10-16 19:44:01 -03:00
Adrian Sbardella 05ed08f50e Merge current main and address PR #1152 review
Preserve published contracts and incorporate the reviewed source/i18n corrections.
2026-10-16 19:15:48 -03:00
Adrian Sbardella de1475a299 Merge main and correct dam inventory documentation 2026-10-16 16:49:21 -03:00
Adrian Sbardella a9df014248 merge: sync OSINT contribution with upstream main and resolve integration conflicts 2026-10-15 09:56:46 -03:00
Adrian Sbardella f05686af26 feat: add Acaray and Yacyreta to the dam inventory 2026-10-15 03:25:36 -03:00