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: main ← Head: dev
main
dev
94ebf02
74ed74f
25336f8
8c3a6eb
b673ae7
49 files changed (+479 additions, -341 deletions)
📝 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)
CHANGELOG.md
backend/apps/ollama/main.py
backend/apps/openai/main.py
backend/apps/webui/main.py
backend/apps/webui/routers/auths.py
backend/apps/webui/routers/users.py
backend/config.py
backend/main.py
package-lock.json
package.json
src/lib/apis/auths/index.ts
src/lib/components/admin/Settings/General.svelte
src/lib/components/layout/Overlay/AccountPending.svelte
src/lib/i18n/locales/ar-BH/translation.json
src/lib/i18n/locales/bg-BG/translation.json
src/lib/i18n/locales/bn-BD/translation.json
src/lib/i18n/locales/ca-ES/translation.json
src/lib/i18n/locales/ceb-PH/translation.json
src/lib/i18n/locales/de-DE/translation.json
src/lib/i18n/locales/dg-DG/translation.json
...and 29 more files
No description provided
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 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:
main← Head:dev📝 Commits (5)
94ebf02Enable http_proxy use for openai calls.74ed74fEnable http_proxy use for ollama calls.25336f8feat: admin details in account pending overlay8c3a6ebMerge pull request #2799 from mindspawn/proxy-fixb673ae7chore: 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.