[PR #3952] [MERGED] Merge develop in to openidc #3782

New issue

Closed

opened 2026-02-26 08:31:55 +03:00 by kerem · 0 comments

kerem commented

2026-02-26 08:31:55 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/NginxProxyManager/nginx-proxy-manager/pull/3952
Author: @Trozz
Created: 8/22/2024
Status: ✅ Merged
Merged: 10/11/2024
Merged by: @jc21

Base: openidc ← Head: openidc

📝 Commits (10+)

4b6f9d9 Remove s6 service timeout
4349d42 Merge pull request #2904 from NginxProxyManager/s6-verbose
0127dc7 Bump version
3d2406a Merge pull request #2905 from NginxProxyManager/develop
05307aa Fix certbot plugins install when using PUID/PGID
2a06384 Merge branch 'master' into develop
824c837 Merge pull request #2906 from NginxProxyManager/develop
4c59400 added support for dns.he.net certbot plugin #2153
847e879 Update certbot-dns-plugins.js
53d61bd Try to fix linter error in certbot plugin definitions.

📊 Changes

230 files changed (+8891 additions, -18158 deletions)

View changed files

➕ .github/workflows/stale.yml (+21 -0)
📝 .gitignore (+4 -0)
📝 .version (+1 -1)
📝 Jenkinsfile (+112 -135)
📝 README.md (+31 -400)
📝 backend/app.js (+10 -10)
📝 backend/db.js (+20 -26)
📝 backend/doc/api.swagger.json (+394 -192)
📝 backend/index.js (+0 -86)
📝 backend/internal/access-list.js (+21 -27)
📝 backend/internal/audit-log.js (+2 -2)
📝 backend/internal/certificate.js (+238 -133)
📝 backend/internal/dead-host.js (+15 -18)
📝 backend/internal/ip_ranges.js (+7 -7)
📝 backend/internal/nginx.js (+93 -92)
📝 backend/internal/proxy-host.js (+18 -19)
📝 backend/internal/redirection-host.js (+17 -20)
📝 backend/internal/stream.js (+17 -19)
📝 backend/internal/token.js (+1 -1)
📝 backend/internal/user.js (+16 -21)

...and 80 more files

📄 Description

The OpenIDC branch appears to have been stale for quite a while, this merges the develop branch in to and resolves merge conflicts, normally with accepting both changes based on sensibilities (not many conflicts)

Conflicting files were

backend/templates/proxy_host.conf
docker/rootfs/etc/nginx/nginx.conf
docs/src/advanced-config/index.md
frontend/js/i18n/messages.json

_{🔄 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/NginxProxyManager/nginx-proxy-manager/pull/3952 **Author:** [@Trozz](https://github.com/Trozz) **Created:** 8/22/2024 **Status:** ✅ Merged **Merged:** 10/11/2024 **Merged by:** [@jc21](https://github.com/jc21) **Base:** `openidc` ← **Head:** `openidc` --- ### 📝 Commits (10+) - [`4b6f9d9`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/4b6f9d9419b004a1f5734eea4b96231870623fa8) Remove s6 service timeout - [`4349d42`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/4349d42636752a7e19a4f05141118538770b3720) Merge pull request #2904 from NginxProxyManager/s6-verbose - [`0127dc7`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/0127dc7f03b98ce5d53d3c1b56ce36a564491aca) Bump version - [`3d2406a`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/3d2406ac3d280bfffe2f65b4933ab83a14f12ab1) Merge pull request #2905 from NginxProxyManager/develop - [`05307aa`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/05307aa253c073cf94237fc96d816ec2919f4d7f) Fix certbot plugins install when using PUID/PGID - [`2a06384`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/2a06384a4aa597777931d38cef49cf89540392e6) Merge branch 'master' into develop - [`824c837`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/824c837a38ac602963d2e7fd12ebc7f95a11c4ac) Merge pull request #2906 from NginxProxyManager/develop - [`4c59400`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/4c59400731b5bc432649d8a0f7aa2bffec79c634) added support for dns.he.net certbot plugin #2153 - [`847e879`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/847e879b3f3f8bce40ac00306603ea8d087a37b7) Update certbot-dns-plugins.js - [`53d61bd`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/53d61bd626bd5fb7cc787f7645a374824cf36eee) Try to fix linter error in certbot plugin definitions. ### 📊 Changes **230 files changed** (+8891 additions, -18158 deletions) <details> <summary>View changed files</summary> ➕ `.github/workflows/stale.yml` (+21 -0) 📝 `.gitignore` (+4 -0) 📝 `.version` (+1 -1) 📝 `Jenkinsfile` (+112 -135) 📝 `README.md` (+31 -400) 📝 `backend/app.js` (+10 -10) 📝 `backend/db.js` (+20 -26) 📝 `backend/doc/api.swagger.json` (+394 -192) 📝 `backend/index.js` (+0 -86) 📝 `backend/internal/access-list.js` (+21 -27) 📝 `backend/internal/audit-log.js` (+2 -2) 📝 `backend/internal/certificate.js` (+238 -133) 📝 `backend/internal/dead-host.js` (+15 -18) 📝 `backend/internal/ip_ranges.js` (+7 -7) 📝 `backend/internal/nginx.js` (+93 -92) 📝 `backend/internal/proxy-host.js` (+18 -19) 📝 `backend/internal/redirection-host.js` (+17 -20) 📝 `backend/internal/stream.js` (+17 -19) 📝 `backend/internal/token.js` (+1 -1) 📝 `backend/internal/user.js` (+16 -21) _...and 80 more files_ </details> ### 📄 Description The OpenIDC branch appears to have been stale for quite a while, this merges the develop branch in to and resolves merge conflicts, normally with accepting both changes based on sensibilities (not many conflicts) Conflicting files were - backend/templates/proxy_host.conf - docker/rootfs/etc/nginx/nginx.conf - docs/src/advanced-config/index.md - frontend/js/i18n/messages.json --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

kerem

2026-02-26 08:31:55 +03:00

closed this issue
added the
pull-request
label

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference

starred/nginx-proxy-manager-NginxProxyManager#3782

No description provided.

Rows
Columns