[PR #2801] [MERGED] 0.2.4 #21106

Closed
opened 2026-04-20 03:21:13 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

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

Base: mainHead: dev


📝 Commits (5)

  • 94ebf02 Enable http_proxy use for openai calls.
  • 74ed74f Enable http_proxy use for ollama calls.
  • 25336f8 feat: admin details in account pending overlay
  • 8c3a6eb Merge pull request #2799 from mindspawn/proxy-fix
  • b673ae7 chore: version bump

📊 Changes

49 files changed (+479 additions, -341 deletions)

View changed files

📝 CHANGELOG.md (+13 -0)
📝 backend/apps/ollama/main.py (+3 -3)
📝 backend/apps/openai/main.py (+2 -2)
📝 backend/apps/webui/main.py (+7 -0)
📝 backend/apps/webui/routers/auths.py (+60 -45)
📝 backend/apps/webui/routers/users.py (+6 -1)
📝 backend/config.py (+14 -0)
📝 backend/main.py (+1 -17)
📝 package-lock.json (+2 -2)
📝 package.json (+1 -1)
📝 src/lib/apis/auths/index.ts (+82 -0)
📝 src/lib/components/admin/Settings/General.svelte (+82 -161)
src/lib/components/layout/Overlay/AccountPending.svelte (+59 -0)
📝 src/lib/i18n/locales/ar-BH/translation.json (+4 -2)
📝 src/lib/i18n/locales/bg-BG/translation.json (+4 -2)
📝 src/lib/i18n/locales/bn-BD/translation.json (+4 -2)
📝 src/lib/i18n/locales/ca-ES/translation.json (+4 -2)
📝 src/lib/i18n/locales/ceb-PH/translation.json (+4 -2)
📝 src/lib/i18n/locales/de-DE/translation.json (+4 -2)
📝 src/lib/i18n/locales/dg-DG/translation.json (+4 -2)

...and 29 more files

📄 Description

No description provided


🔄 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/2801 **Author:** [@tjbck](https://github.com/tjbck) **Created:** 6/4/2024 **Status:** ✅ Merged **Merged:** 6/4/2024 **Merged by:** [@tjbck](https://github.com/tjbck) **Base:** `main` ← **Head:** `dev` --- ### 📝 Commits (5) - [`94ebf02`](https://github.com/open-webui/open-webui/commit/94ebf027197e5bf8faa58e83c6ce1f0a65441bfd) Enable http_proxy use for openai calls. - [`74ed74f`](https://github.com/open-webui/open-webui/commit/74ed74f1a4ec30b6ea6fc2124395d9033451edf2) Enable http_proxy use for ollama calls. - [`25336f8`](https://github.com/open-webui/open-webui/commit/25336f85f3caf6f193d4e7b48ee939d25f954cce) feat: admin details in account pending overlay - [`8c3a6eb`](https://github.com/open-webui/open-webui/commit/8c3a6eb26242141d2a2a87e5fda9e2d56db86030) Merge pull request #2799 from mindspawn/proxy-fix - [`b673ae7`](https://github.com/open-webui/open-webui/commit/b673ae7ab27e4df52b488c9120e3508a3b57e74e) chore: version bump ### 📊 Changes **49 files changed** (+479 additions, -341 deletions) <details> <summary>View changed files</summary> 📝 `CHANGELOG.md` (+13 -0) 📝 `backend/apps/ollama/main.py` (+3 -3) 📝 `backend/apps/openai/main.py` (+2 -2) 📝 `backend/apps/webui/main.py` (+7 -0) 📝 `backend/apps/webui/routers/auths.py` (+60 -45) 📝 `backend/apps/webui/routers/users.py` (+6 -1) 📝 `backend/config.py` (+14 -0) 📝 `backend/main.py` (+1 -17) 📝 `package-lock.json` (+2 -2) 📝 `package.json` (+1 -1) 📝 `src/lib/apis/auths/index.ts` (+82 -0) 📝 `src/lib/components/admin/Settings/General.svelte` (+82 -161) ➕ `src/lib/components/layout/Overlay/AccountPending.svelte` (+59 -0) 📝 `src/lib/i18n/locales/ar-BH/translation.json` (+4 -2) 📝 `src/lib/i18n/locales/bg-BG/translation.json` (+4 -2) 📝 `src/lib/i18n/locales/bn-BD/translation.json` (+4 -2) 📝 `src/lib/i18n/locales/ca-ES/translation.json` (+4 -2) 📝 `src/lib/i18n/locales/ceb-PH/translation.json` (+4 -2) 📝 `src/lib/i18n/locales/de-DE/translation.json` (+4 -2) 📝 `src/lib/i18n/locales/dg-DG/translation.json` (+4 -2) _...and 29 more files_ </details> ### 📄 Description _No description provided_ --- <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 2026-04-20 03:21:13 -05: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#21106