[PR #1965] [MERGED] 0.1.124 #7648

Closed
opened 2025-11-11 17:32:21 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/open-webui/open-webui/pull/1965
Author: @tjbck
Created: 5/4/2024
Status: Merged
Merged: 5/8/2024
Merged by: @tjbck

Base: mainHead: dev


📝 Commits (10+)

  • 142f82b Added some i18n keys & updated german locale
  • 30d1048 resolved the conflicts 😍
  • dd52ea9 added and improved some german translations
  • e57c0c3 resolved conflicts #2
  • 9d8c23b fix: synchronized with the latest updates.
  • 115c3a3 add Symbol startup prompt startup instructions in ShortcutsModal
  • ecfb689 refac
  • e4c7762 Merge pull request #1946 from Yanyutin753/shortcuts-dev
  • 46027cc Merge branch 'dev' into dev
  • e3a3a03 Merge pull request #1944 from aguvener/dev

📊 Changes

106 files changed (+4941 additions, -1565 deletions)

View changed files

📝 .github/dependabot.yml (+10 -9)
📝 .github/pull_request_template.md (+1 -0)
📝 .github/workflows/integration-test.yml (+10 -1)
📝 CHANGELOG.md (+22 -0)
📝 README.md (+1 -1)
📝 backend/apps/audio/main.py (+12 -0)
📝 backend/apps/litellm/main.py (+4 -0)
📝 backend/apps/ollama/main.py (+85 -8)
📝 backend/apps/rag/main.py (+76 -12)
📝 backend/apps/rag/utils.py (+27 -22)
📝 backend/apps/web/routers/auths.py (+16 -1)
📝 backend/apps/web/routers/chats.py (+74 -64)
📝 backend/config.py (+38 -19)
📝 backend/constants.py (+3 -0)
📝 backend/main.py (+57 -4)
📝 backend/requirements.txt (+2 -4)
📝 backend/start.sh (+1 -1)
📝 backend/start_windows.bat (+1 -1)
📝 backend/utils/misc.py (+4 -3)
kubernetes/helm/.helmignore (+0 -1)

...and 80 more files

📄 Description

Resolves #1911 #1918 #1695 #1971 #929


🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/open-webui/open-webui/pull/1965 **Author:** [@tjbck](https://github.com/tjbck) **Created:** 5/4/2024 **Status:** ✅ Merged **Merged:** 5/8/2024 **Merged by:** [@tjbck](https://github.com/tjbck) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (10+) - [`142f82b`](https://github.com/open-webui/open-webui/commit/142f82bae5ee3ad5d860c06bf7519186229b424c) Added some i18n keys & updated german locale - [`30d1048`](https://github.com/open-webui/open-webui/commit/30d1048099e43c12abb4b68fac9f59c9fc5f2c8e) resolved the conflicts 😍 - [`dd52ea9`](https://github.com/open-webui/open-webui/commit/dd52ea9d3d98d6fa98a309ba682e90f0dadae4ef) added and improved some german translations - [`e57c0c3`](https://github.com/open-webui/open-webui/commit/e57c0c301c7fbe98d9c96a86890443cd83fc5bb9) resolved conflicts #2 - [`9d8c23b`](https://github.com/open-webui/open-webui/commit/9d8c23b3b2f289383069d73fe90d00efd41dd359) fix: synchronized with the latest updates. - [`115c3a3`](https://github.com/open-webui/open-webui/commit/115c3a38a799e45fbf1d5eead586155945115f48) ✨add Symbol startup prompt startup instructions in ShortcutsModal - [`ecfb689`](https://github.com/open-webui/open-webui/commit/ecfb6891f640e644132407c969bf1cd7fee5f484) refac - [`e4c7762`](https://github.com/open-webui/open-webui/commit/e4c77628be81273c2dbe143c0b65cc604cec2be0) Merge pull request #1946 from Yanyutin753/shortcuts-dev - [`46027cc`](https://github.com/open-webui/open-webui/commit/46027cc3909839b39bcba5efb94f96dd76b53256) Merge branch 'dev' into dev - [`e3a3a03`](https://github.com/open-webui/open-webui/commit/e3a3a034c16f115a836e520bb14f80890ea7c244) Merge pull request #1944 from aguvener/dev ### 📊 Changes **106 files changed** (+4941 additions, -1565 deletions) <details> <summary>View changed files</summary> 📝 `.github/dependabot.yml` (+10 -9) 📝 `.github/pull_request_template.md` (+1 -0) 📝 `.github/workflows/integration-test.yml` (+10 -1) 📝 `CHANGELOG.md` (+22 -0) 📝 `README.md` (+1 -1) 📝 `backend/apps/audio/main.py` (+12 -0) 📝 `backend/apps/litellm/main.py` (+4 -0) 📝 `backend/apps/ollama/main.py` (+85 -8) 📝 `backend/apps/rag/main.py` (+76 -12) 📝 `backend/apps/rag/utils.py` (+27 -22) 📝 `backend/apps/web/routers/auths.py` (+16 -1) 📝 `backend/apps/web/routers/chats.py` (+74 -64) 📝 `backend/config.py` (+38 -19) 📝 `backend/constants.py` (+3 -0) 📝 `backend/main.py` (+57 -4) 📝 `backend/requirements.txt` (+2 -4) 📝 `backend/start.sh` (+1 -1) 📝 `backend/start_windows.bat` (+1 -1) 📝 `backend/utils/misc.py` (+4 -3) ➖ `kubernetes/helm/.helmignore` (+0 -1) _...and 80 more files_ </details> ### 📄 Description Resolves #1911 #1918 #1695 #1971 #929 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-11 17:32:21 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/open-webui#7648