[PR #592] [MERGED] v2.5.0 #3272

Closed
opened 2026-02-26 07:38:41 +03:00 by kerem · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/NginxProxyManager/nginx-proxy-manager/pull/592
Author: @jc21
Created: 9/3/2020
Status: Merged
Merged: 9/3/2020
Merged by: @jc21

Base: masterHead: develop


📝 Commits (10+)

  • 01660b5 Fixed now_helper for sqlite: it should also returns the time.
  • d686565 Merge pull request #544 from jlesage/sqlite-now-helper-fix
  • 7034613 Bump prismjs from 1.20.0 to 1.21.0 in /docs
  • 5d65166 Ignore local subnets for real IP determination
  • f539e81 Removed the hardcoded --webroot certbot argument to better support DNS challenge. Also, this option is already set in the default letsencrypt.ini.
  • 83fad8b Removed usage of FROM_UNIXTIME mysql-specific function.
  • f78a4c6 Bump bcrypt from 4.0.1 to 5.0.0 in /backend
  • 6694a42 Merge pull request #560 from jlesage/remove-from-unixtime
  • 251aac7 Add CloudFlare DNS plugin to certbot
  • 2d7576c add cloudflare dns also to dev docker file

📊 Changes

21 files changed (+380 additions, -103 deletions)

View changed files

📝 .version (+1 -1)
📝 README.md (+13 -1)
📝 backend/internal/certificate.js (+115 -35)
📝 backend/models/now_helper.js (+1 -1)
📝 backend/package.json (+1 -1)
📝 backend/schema/endpoints/certificates.json (+6 -0)
📝 backend/yarn.lock (+18 -18)
📝 docker/Dockerfile (+2 -1)
📝 docker/dev/Dockerfile (+2 -1)
📝 docker/rootfs/etc/nginx/nginx.conf (+6 -3)
📝 docs/yarn.lock (+3 -3)
📝 frontend/js/app/nginx/certificates/form.ejs (+18 -0)
📝 frontend/js/app/nginx/certificates/form.js (+51 -11)
📝 frontend/js/app/nginx/certificates/list/item.ejs (+1 -1)
📝 frontend/js/app/nginx/dead/form.ejs (+17 -0)
📝 frontend/js/app/nginx/dead/form.js (+30 -8)
📝 frontend/js/app/nginx/proxy/form.ejs (+17 -0)
📝 frontend/js/app/nginx/proxy/form.js (+30 -9)
📝 frontend/js/app/nginx/redirection/form.ejs (+17 -0)
📝 frontend/js/app/nginx/redirection/form.js (+29 -8)

...and 1 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/NginxProxyManager/nginx-proxy-manager/pull/592 **Author:** [@jc21](https://github.com/jc21) **Created:** 9/3/2020 **Status:** ✅ Merged **Merged:** 9/3/2020 **Merged by:** [@jc21](https://github.com/jc21) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`01660b5`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/01660b5b805e94f1e5cba1802a526c5c127cf5b3) Fixed now_helper for sqlite: it should also returns the time. - [`d686565`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/d68656559c34c63664035aa0266f6bbdbd997dc8) Merge pull request #544 from jlesage/sqlite-now-helper-fix - [`7034613`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/70346138a72b1864117554787102184cc88832cf) Bump prismjs from 1.20.0 to 1.21.0 in /docs - [`5d65166`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/5d6516677791bc2edc22bf3e386eaa05fbfa9f12) Ignore local subnets for real IP determination - [`f539e81`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/f539e813aafc997d52633dc17ee7a4f9c828b8a3) Removed the hardcoded `--webroot` certbot argument to better support DNS challenge. Also, this option is already set in the default `letsencrypt.ini`. - [`83fad8b`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/83fad8bcda54944b73496485de8874db055a1e3a) Removed usage of `FROM_UNIXTIME` mysql-specific function. - [`f78a4c6`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/f78a4c6ad128dc78b02ff3df7cf00503dfd25756) Bump bcrypt from 4.0.1 to 5.0.0 in /backend - [`6694a42`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/6694a422702fb6de06b104677ce85d0755bf53e2) Merge pull request #560 from jlesage/remove-from-unixtime - [`251aac7`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/251aac716a707d730733444b71247402be678f08) Add CloudFlare DNS plugin to certbot - [`2d7576c`](https://github.com/NginxProxyManager/nginx-proxy-manager/commit/2d7576c57ea9d0219a5321678adf162f580e26b3) add cloudflare dns also to dev docker file ### 📊 Changes **21 files changed** (+380 additions, -103 deletions) <details> <summary>View changed files</summary> 📝 `.version` (+1 -1) 📝 `README.md` (+13 -1) 📝 `backend/internal/certificate.js` (+115 -35) 📝 `backend/models/now_helper.js` (+1 -1) 📝 `backend/package.json` (+1 -1) 📝 `backend/schema/endpoints/certificates.json` (+6 -0) 📝 `backend/yarn.lock` (+18 -18) 📝 `docker/Dockerfile` (+2 -1) 📝 `docker/dev/Dockerfile` (+2 -1) 📝 `docker/rootfs/etc/nginx/nginx.conf` (+6 -3) 📝 `docs/yarn.lock` (+3 -3) 📝 `frontend/js/app/nginx/certificates/form.ejs` (+18 -0) 📝 `frontend/js/app/nginx/certificates/form.js` (+51 -11) 📝 `frontend/js/app/nginx/certificates/list/item.ejs` (+1 -1) 📝 `frontend/js/app/nginx/dead/form.ejs` (+17 -0) 📝 `frontend/js/app/nginx/dead/form.js` (+30 -8) 📝 `frontend/js/app/nginx/proxy/form.ejs` (+17 -0) 📝 `frontend/js/app/nginx/proxy/form.js` (+30 -9) 📝 `frontend/js/app/nginx/redirection/form.ejs` (+17 -0) 📝 `frontend/js/app/nginx/redirection/form.js` (+29 -8) _...and 1 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>
kerem 2026-02-26 07:38:41 +03:00
Sign in to join this conversation.
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#3272
No description provided.