Skip to content

merge #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 560 commits into from
May 13, 2025
Merged

merge #1

merged 560 commits into from
May 13, 2025

Conversation

@xuantong
Copy link
Owner

@xuantong xuantong commented May 13, 2025

No description provided.

laride and others added 30 commits April 23, 2025 10:49
@laride
add PUBLIC_PATH env
7f76b5f
@openrz
udpate:更新编译文档
f0bfdba
@xinnan-tech
udpate:更新编译文档 (#948)
6dd967f
@taiping520
Merge branch 'xinnan-tech:main' into main
c3fbff3
@openrz
update:增加HomeAssistant教程
109754f
@xinnan-tech
Merge pull request #955 from xinnan-tech/update-readme
2e0a1c0 
update:增加HomeAssistant教程
@TinsFox
update: 修改智控台登录地址为8002
e6a90c4
@openrz
Merge pull request #959 from TinsFox/main
fa81f4a 
update: 修改智控台登录地址为8002
@openrz
update:让alibl、等非原生llm使用function时不卡顿
951370e
@xinnan-tech
Merge pull request #962 from xinnan-tech/update-fix
edc601c 
update:让alibl、等非原生llm使用functional时不卡顿
@openrz
fix:取消docker版上传ota固件时默认的文件大小限制
3c62ada
@xinnan-tech
Merge pull request #964 from xinnan-tech/update-fix
0739fa2 
fix:取消docker版上传ota固件时默认的文件大小限制
@studentCGD
update:"默认提示词"取消用户位置
969b5fc
@studentCGD
update:修改"获取天气"的逻辑顺序
c0c5630
@Sakura-RanChen
Merge pull request #965 from xinnan-tech/py_test
19cbd3b 
Py test
@studentCGD
update:添加"加载中"样式，修改分页器样式
c5218d4
@taiping520
Merge branch 'xinnan-tech:main' into main
d83e1c6
@openrz
update:优化模型配置左侧栏显示
497fc1d
@openrz
Merge pull request #934 from taiping520/main
78f2f21 
fix: 修复tts失败不重试问题
@openrz
update:优化tts异常捕获
b3191f5
@openrz
Merge pull request #944 from laride/feat/add-public-path-env
39f81dd 
添加前端部署路径环境变量
@openrz
Merge branch 'model-config-ui' into feat/volces-ai-gateway
6977d6b
@openrz
Merge pull request #933 from laride/feat/volces-ai-gateway
21a08b3 
添加火山引擎边缘大模型网关 LLM/TTS
@studentCGD
update:修改了表格样式，增加了滑动条等，使其与其他页面基本对齐一致
b4e9d77
@huangjunsen0406
fix: vue.config.js
b5b4c5c 
修复publicPath空串问题、默认是"/"
@huangjunsen0406
fix: index.js
1d8b898 
修复router没有设置base
@Sakura-RanChen
Merge pull request #968 from xinnan-tech/web-vue-ota-modify
beb420c 
Web vue ota modify
@openrz
修复tts名字过长
8e5770f
@xinnan-tech
Merge pull request #967 from xinnan-tech/model-config-ui
d9085b8 
update:优化模型配置左侧栏显示
@openrz
update:天气插件优化
b0b4f87
ljwwd2 and others added 29 commits May 11, 2025 03:23
@ljwwd2
Merge branch 'xinnan-tech:main' into main
411e73b
@ljwwd2
前端-根据agentId获取智能体配置
66a0bee
@ljwwd2
Merge remote-tracking branch 'origin/main'
af9eb53
@openrz
update:优化小图显示
0e30f69
@openrz
update:优化非LLM使用functioncall意图识别的提示
846f896
@openrz
update:优化新增固件框宽度显示
217ceb1
@openrz
Merge pull request #1175 from ljwwd2/main
9e6fc32 
聊天记录支持配置
@openrz
update:修改记录类型为0、1、2
bfb5420
@CaixyPromise
Merge branch 'refs/heads/feature/gemini-llm' into update/enhance-gemi…
e04c38e 
…ni-with-proxy
@Sakura-RanChen
增加插件管理的页面
c0ec433
@openrz
Merge branch 'manager-plugin-api' into web-Plug
0294885
@openrz
Merge pull request #1198 from xinnan-tech/web-Plug
def598f 
增加插件管理的页面
@openrz
update:数据库增加聊天上报策略字段
add000d
@openrz
Merge branch 'manager-plugin-api' of https://github.com/xinnan-tech/x…
fd1c4ec 
…iaozhi-esp32-server into manager-plugin-api
@openrz
update:聊天记录上报模式和记忆模式绑定
4a0bdbf
@openrz
update:保存智能体配置时，删除对应的历史记录
ac7b02d
@Sakura-RanChen
完善插件管理页面
afd03ba
@Sakura-RanChen
Merge branch 'manager-plugin-api' of https://github.com/xinnan-tech/x…
37f7511 
…iaozhi-esp32-server into manager-plugin-api
@openrz
update:右智控台下发聊天记录上报策略
dd38fc7
@openrz
Merge branch 'manager-plugin-api' of https://github.com/xinnan-tech/x…
0e1ec05 
…iaozhi-esp32-server into manager-plugin-api
@openrz
update:更新版本号
62b7cc5
@openrz
update:优化插件显示
4ef755e
@xinnan-tech
Merge pull request #1206 from xinnan-tech/manager-plugin-api
6e210fa 
聊天记录支持配置
@CaixyPromise
Merge remote-tracking branch 'upstream/main' into update/enhance-gemi…
bfc3d48 
…ni-with-proxy
@CaixyPromise
update: 改进gemini连通代理能力，自动测试与装配合适的代理配置信息。
168bc9e
@CaixyPromise
chore: 删除无用的包引入。
3ce2043
@CaixyPromise
chore: 删除无用的包引入。
f772155
@openrz
Merge pull request #1208 from CaixyPromise/update/enhance-gemini-with…
dd577a7 
…-proxy

Update: 提升Gemini代理配置能力，支持function_call调用与stream流式对话能力
@xinnan-tech
Merge pull request #1211 from xinnan-tech/enhance-gemini-with-proxy
6af6fe2 
Enhance gemini with proxy
@xuantong xuantong merged commit f8d685b into xuantong:main May 13, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.