Brooklyn Nicholson
|
062eed654d
|
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
|
2026-05-16 11:36:22 -05:00 |
|
Brooklyn Nicholson
|
6640a9d3ab
|
Merge main into bb/gui.
Resolve merge conflicts while preserving bb/gui dashboard paths and STT provider support.
|
2026-05-15 15:33:28 -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
|
9222f1c491
|
Merge branch 'main' of github.com:NousResearch/hermes-agent into bb/gui
|
2026-05-09 09:57:46 -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
|
81d4316b4a
|
Merge origin/main into bb/gui — resolve server + docs navbar conflicts
|
2026-05-06 14:07:38 -05: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 |
|