merge: resolve conflicts with develop (M10-Telemetry + M12-MatrixBridge)
All checks were successful
ci/woodpecker/push/infra Pipeline was successful
ci/woodpecker/push/coordinator Pipeline was successful
ci/woodpecker/push/orchestrator Pipeline was successful
ci/woodpecker/push/api Pipeline was successful
ci/woodpecker/push/web Pipeline was successful

Merge origin/develop into feature/m13-speech-services to incorporate
M10-Telemetry and M12-MatrixBridge changes. Resolved 4 conflicts:
- .env.example: Added speech config alongside telemetry + matrix config
- Makefile: Added speech targets alongside matrix targets
- app.module.ts: Import both MosaicTelemetryModule and SpeechModule
- docs/tasks.md: Combined all milestone task tracking sections

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
2026-02-15 12:31:08 -06:00
68 changed files with 12466 additions and 358 deletions

View File

@@ -16,6 +16,7 @@ export function Navigation(): React.JSX.Element {
{ href: "/tasks", label: "Tasks" },
{ href: "/calendar", label: "Calendar" },
{ href: "/knowledge", label: "Knowledge" },
{ href: "/usage", label: "Usage" },
];
// Global keyboard shortcut for search (Cmd+K or Ctrl+K)