emozilla
|
fa48c2501f
|
Merge branch 'main' into bb/gui
|
2026-05-20 16:01:41 -04:00 |
|
emozilla
|
85c583dc34
|
Merge remote-tracking branch 'origin/main' into bb/gui
# Conflicts:
# apps/dashboard/package-lock.json
# apps/dashboard/package.json
# apps/dashboard/src/components/BottomPickSheet.tsx
# apps/dashboard/src/hooks/useBelowBreakpoint.ts
# gateway/platforms/telegram.py
# hermes_cli/gateway.py
# hermes_cli/web_server.py
# nix/web.nix
# scripts/install.ps1
# tests/gateway/test_telegram_thread_fallback.py
# tui_gateway/server.py
|
2026-05-20 01:35:02 -04:00 |
|
emozilla
|
e74f291dc2
|
Merge branch 'main' into bb/gui
|
2026-05-18 13:14:46 -04:00 |
|
Brooklyn Nicholson
|
02aaac8f73
|
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
# Conflicts:
# cli.py
# hermes_cli/main.py
# run_agent.py
# tests/hermes_cli/test_cmd_update.py
# tools/mcp_tool.py
# web/src/lib/gatewayClient.ts
|
2026-05-18 01:26:56 -05:00 |
|
Brooklyn Nicholson
|
c7e6a48bfb
|
feat: more ui qa
|
2026-05-16 21:26:50 -05:00 |
|
emozilla
|
747caa74f0
|
Merge branch 'main' into bb/gui
|
2026-05-12 21:18:07 -04:00 |
|
Brooklyn Nicholson
|
dc66a98430
|
Merge remote-tracking branch 'origin/main' into bb/gui
# Conflicts:
# apps/dashboard/src/i18n/af.ts
# apps/dashboard/src/i18n/de.ts
# apps/dashboard/src/i18n/es.ts
# apps/dashboard/src/i18n/fr.ts
# apps/dashboard/src/i18n/ga.ts
# apps/dashboard/src/i18n/hu.ts
# apps/dashboard/src/i18n/it.ts
# apps/dashboard/src/i18n/ja.ts
# apps/dashboard/src/i18n/ko.ts
# apps/dashboard/src/i18n/pt.ts
# apps/dashboard/src/i18n/ru.ts
# apps/dashboard/src/i18n/tr.ts
# apps/dashboard/src/i18n/uk.ts
# apps/dashboard/src/i18n/zh-hant.ts
# gateway/config.py
# hermes_cli/main.py
# plugins/strike-freedom-cockpit/README.md
# tui_gateway/server.py
|
2026-05-11 16:40:09 -04:00 |
|
Brooklyn Nicholson
|
fc9d18b03f
|
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
# Conflicts:
# tui_gateway/server.py
|
2026-05-07 21:19:31 -04:00 |
|
Brooklyn Nicholson
|
ca8f2c7907
|
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
|
2026-05-04 12:47:53 -05:00 |
|
Brooklyn Nicholson
|
a66303eaef
|
feat: move dashboard to apps/ so we can share ws proto
|
2026-05-02 13:38:49 -05:00 |
|