starred/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2026-09-24 13:50:20 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity
606 Commits 13 Branches 89 Tags
static-content
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jc21 066a765a4d Merge pull request #1048 from jc21/develop 
static-content <- develop
 2021-04-29 21:36:38 +10:00
Jamie Curnow f2f653e345 Remove platform specific determination 2021-04-29 11:19:59 +10:00
jc21 b39a59ce72 Merge pull request #1045 from jc21/nginx-full 
Switch to nginx-full base
 2021-04-29 09:29:46 +10:00
Jamie Curnow 9872daf29f Switch to nginx-full base 2021-04-29 08:28:40 +10:00
Jamie Curnow ba5f0c212c Bumped version 2021-03-17 14:56:22 +10:00
jc21 4eddb5d7f3 Merge pull request #769 from jc21/dependabot/npm_and_yarn/frontend/ini-1.3.8 
Bump ini from 1.3.5 to 1.3.8 in /frontend
 2021-03-17 14:54:45 +10:00
Jamie Curnow 3b104710d5 Restrict redirect http code 2021-03-17 14:53:57 +10:00
jc21 74db0004bd Merge pull request #883 from baruffaldi/master 
Forward scheme and http code added for redirection hosts
 2021-03-17 11:30:26 +10:00
jc21 6e67352a0f Merge pull request #880 from jlesage/jwt-key-pair-no-restart 
Removed the need to restart Nginx Proxy Manager after generating JWT key pair
 2021-03-17 11:09:37 +10:00
Jamie Curnow b127f02468 Added upgrade steps 2021-03-17 08:58:45 +10:00
jc21 c9c53d9670 Merge pull request #903 from ogarai/edit-disabled-host 
Prevent activating nginx config after editing disabled proxy host
 2021-03-17 08:32:14 +10:00
jc21 d36dbb868b Merge pull request #942 from nielscil/develop-certbot-dns-transip 
Added TransIP dns provider
 2021-03-17 08:30:05 +10:00
jc21 b7fb2cfe92 Merge pull request #947 from phantomski77/patch-2 
Update _hsts.conf template to increase HSTS max-age value
 2021-03-17 08:29:46 +10:00
jc21 e4988f34c7 Merge pull request #943 from phantomski77/patch-1 
Update README.md
 2021-03-16 19:51:03 +10:00
jc21 1fe9e24f0a Merge pull request #920 from jc21/dependabot/npm_and_yarn/docs/prismjs-1.23.0 
Bump prismjs from 1.21.0 to 1.23.0 in /docs
 2021-03-16 19:50:28 +10:00
jc21 9c39de3454 Merge pull request #935 from jc21/dependabot/npm_and_yarn/frontend/elliptic-6.5.4 
Bump elliptic from 6.5.3 to 6.5.4 in /frontend
 2021-03-16 19:50:14 +10:00
jc21 9bb68ad4eb Merge pull request #937 from jc21/dependabot/npm_and_yarn/docs/elliptic-6.5.4 
Bump elliptic from 6.5.3 to 6.5.4 in /docs
 2021-03-16 19:49:59 +10:00
jc21 5bf774bee1 Merge branch 'develop' into develop-certbot-dns-transip 2021-03-16 19:49:27 +10:00
jc21 99514464fb Merge pull request #946 from ijaron/dns-acme 
Add ACME-DNS certbot plugin
 2021-03-16 19:48:13 +10:00
jc21 3bf1c1e531 Merge pull request #948 from GurjinderSingh/patch-1 
Update README.md
 2021-03-16 13:59:04 +10:00
Jamie Curnow e2e31094aa Fix CI, no var needed for this 2021-03-16 11:32:38 +10:00
Jamie Curnow bb5fc58f3a Revert "Fix CI, use docker for a yarn command" 
This reverts commit afbec0aca9.
 2021-03-11 09:29:08 +10:00
Jamie Curnow afbec0aca9 Fix CI, use docker for a yarn command 2021-03-11 08:41:10 +10:00
jc21 b7b808d98d Merge pull request #899 from jc21/develop 
Docs for a docker network
 2021-02-17 20:56:10 +10:00
Jamie Curnow a21289bf11 Docs for a docker network 2021-02-17 20:55:12 +10:00
jc21 4a8d01224a Merge pull request #897 from jc21/develop 
Update github templates and docs
 2021-02-17 20:19:49 +10:00
Jamie Curnow f0eebc43e3 Update github templates and docs 2021-02-17 20:18:12 +10:00
jc21 ea28da90b2 Merge pull request #876 from jc21/develop 
v2.8.0
 2021-02-08 15:01:31 +10:00
jc21 a2dde00f40 Merge pull request #868 from lorisbergeron/eurodns-as-provider 
Add EuroDNS as a DNS provider
 2021-02-08 12:22:33 +10:00
jc21 5ff07faa7e Merge pull request #872 from ahgraber/master 
Add Docker secrets
 2021-02-08 11:59:23 +10:00
jc21 d27826d10e Merge pull request #850 from MooBaloo/master 
Add new custom http.conf above includes for NPM-generated files
 2021-02-01 12:10:31 +10:00
jc21 efa841d75a Merge pull request #842 from Shuro/patch-1 
Use configured default page also for IPv6
 2021-01-28 08:45:12 +10:00
jc21 8cb44c7b97 Merge pull request #830 from jc21/develop 
Updated version fixes #823
 2021-01-18 12:15:20 +10:00
jc21 f2293a9dda Merge branch 'master' into develop 2021-01-18 12:15:04 +10:00
Jamie Curnow da0d1d4a2f Updated version fixes #823 2021-01-18 12:14:13 +10:00
jc21 6a8d5e2166 Merge pull request #820 from jc21/develop 
v2.7.3
 2021-01-12 11:13:35 +10:00
jc21 d732665a23 Merge branch 'master' into develop 2021-01-12 09:06:34 +10:00
Jamie Curnow e0748c9bc7 Bumped version 2021-01-12 09:05:27 +10:00
jc21 bfb328238e Merge pull request #806 from jc21/develop 
v2.7.2
 2021-01-07 09:35:35 +10:00
Jamie Curnow 64cc4f57d6 Version bump and acknowledgements 2021-01-06 21:48:10 +10:00
jc21 7a3c91c6a4 Merge pull request #804 from lebrou34/master 
Add Gandi Live DNS to certbot-dns-plugins.js
 2021-01-06 13:14:54 +10:00
jc21 1faac4edf2 Merge pull request #750 from klutchell/klutchell-patch-1 
allow custom stream conf
 2021-01-03 20:14:55 +10:00
jc21 4c60dce169 Merge pull request #796 from lightglitch/patch-1 
Fix dead hosts verification count
 2021-01-03 20:14:36 +10:00
jc21 771f31f44d Merge pull request #770 from jc21/dependabot/npm_and_yarn/backend/ini-1.3.8 
Bump ini from 1.3.5 to 1.3.8 in /backend
 2021-01-03 20:14:21 +10:00
jc21 8bedb95e1d Merge pull request #771 from jc21/dependabot/npm_and_yarn/test/ini-1.3.8 
Bump ini from 1.3.5 to 1.3.8 in /test
 2021-01-03 20:14:03 +10:00
jc21 ac4be08df2 Merge pull request #772 from jc21/dependabot/npm_and_yarn/docs/ini-1.3.8 
Bump ini from 1.3.5 to 1.3.8 in /docs
 2021-01-03 20:13:49 +10:00
jc21 0d6e058e23 Merge pull request #774 from chaptergy/better-custom-certificate-handling 
Better custom certificate handling
 2021-01-03 12:09:55 +10:00
Jamie Curnow bc1c50ac92 Added contributor 2020-11-22 21:50:57 +10:00
jc21 8c2ab42b75 Merge pull request #738 from WaterCalm/master 
add aliyun DNS plugin
 2020-11-22 21:48:24 +10:00
Jamie Curnow 6fed642aba Cypress docker build should be faster and added mkcert for later 2020-11-22 16:57:12 +10:00
jc21 72ac549a58 Merge pull request #729 from jc21/develop 
v2.7.1
 2020-11-18 22:55:47 +10:00
jc21 9f38617135 Merge branch 'master' into develop 2020-11-18 22:55:37 +10:00
Jamie Curnow 94eec805df Version bump 2020-11-18 21:46:21 +10:00
Jamie Curnow 05a940e732 Fix instances where config file exists and env vars don't 2020-11-18 21:42:03 +10:00
jc21 1c43cc2181 Merge pull request #725 from jc21/develop 
v2.7.0
 2020-11-18 14:30:44 +10:00
jc21 657ee73ff1 Merge branch 'master' into develop 2020-11-18 12:22:34 +10:00
Jamie Curnow 4ee5d993cf Bumped version 2020-11-18 12:21:35 +10:00
jc21 70a445e2d7 Merge pull request #704 from chaptergy/allow-setup-without-config-file 
Removes the need of a config file and allows db config via environment
 2020-11-18 12:18:45 +10:00
jc21 2115da210d Merge pull request #694 from chaptergy/visual-indicator-for-certificate-deletion 
Adds visual indicator for certificate deletion
 2020-11-09 10:10:55 +10:00
jc21 540554c4f6 Merge pull request #695 from chaptergy/failed-certificate-autoremove 
Adds autoremove of failed certificate creations in DB
 2020-11-09 10:10:00 +10:00
jc21 cf8812c932 Merge pull request #692 from jc21/develop 
v2.6.2
 2020-11-06 19:31:10 +10:00
Jamie Curnow 5bc3e474a9 Merge branch 'real_ip' of github.com:jc21/nginx-proxy-manager into develop 2020-11-06 13:21:37 +10:00
Jamie Curnow 13eaa346bc Use remote addr as real ip 2020-11-06 13:21:22 +10:00
Jamie Curnow d7437cc4a7 Test for real-ip header 2020-11-06 13:17:30 +10:00
Jamie Curnow ddb3c6590c Version bump 2020-11-06 13:06:15 +10:00
Jamie Curnow 89d6773bda Merge branch 'develop' of github.com:jc21/nginx-proxy-manager into real_ip 2020-11-06 09:18:25 +10:00
Jamie Curnow 3651b9484f Fix for pip install error when there are no plugins to install 2020-11-06 09:17:52 +10:00
Jamie Curnow 2200c950b7 Merge branch 'develop' of github.com:jc21/nginx-proxy-manager into real_ip 2020-11-06 09:12:35 +10:00
jc21 14f84f01b5 Merge pull request #687 from chaptergy/allow-additional-dns-challenge-dependencies 
Allow additional dns challenge dependencies
 2020-11-06 09:02:35 +10:00
Jamie Curnow f192748bf9 Use x-real-ip header for the real-ip module 2020-10-19 11:40:50 +10:00
jc21 96f401cba6 Merge pull request #664 from chaptergy/fixes-expiring-hosts-renewal 
Adds certbot plugin installation check on startup
 2020-10-19 08:50:44 +10:00
jc21 ffd2430160 Merge pull request #666 from MarceloLagos/master 
Check key for RSA header otherwise use EC, and output fix.
 2020-10-19 08:45:28 +10:00
jc21 301499dc52 Merge pull request #659 from jc21/develop 
v2.6.1
 2020-10-16 15:53:56 +10:00
jc21 5c2f13ed8e Merge branch 'master' into develop 2020-10-16 13:44:10 +10:00
Jamie Curnow e30ad81f69 Updated version 2020-10-16 13:43:13 +10:00
Jamie Curnow 21f36f535f Don't spit out a ; if the preceeding value is empty 2020-10-16 13:41:08 +10:00
jc21 c14236823a Merge pull request #656 from chaptergy/fixes-custom-certificate-upload 
Fixes custom certificate upload
 2020-10-16 08:33:51 +10:00
jc21 e3399e1035 Merge pull request #654 from jc21/develop 
2.6.0 Release
 2020-10-15 15:14:57 +10:00
Jamie Curnow c413b4af3f Added contributors 2020-10-15 14:06:21 +10:00
Jamie Curnow dbf5dec23b Bump version 2020-10-15 10:40:01 +10:00
Jamie Curnow 10f0eb17d7 Fix linting errors 2020-10-15 10:33:51 +10:00
jc21 e3b680c351 Merge pull request #653 from jmwebslave/dont-pass-auth-header 
Pass/Don't Pass Auth Header
 2020-10-15 10:10:33 +10:00
jc21 165bfc9f5f Merge pull request #607 from jc21/dependabot/npm_and_yarn/docs/node-forge-0.10.0 
Bump node-forge from 0.9.1 to 0.10.0 in /docs
 2020-10-15 08:34:14 +10:00
jc21 5830bd73b9 Merge pull request #608 from Philip-Mooney/master 
Fix for access list getAll when not granted all permissions
 2020-10-15 08:33:58 +10:00
jc21 3c4ce839b9 Merge pull request #635 from chaptergy/allow-more-dns-challenges 
Allow DNS challenges not just for cloudflare
 2020-10-14 19:12:15 +10:00
jc21 28f72086ec Merge pull request #592 from jc21/develop 
v2.5.0
 2020-09-04 09:07:47 +10:00
Jamie Curnow a6b9bd7b01 Version bump and contributors 2020-09-03 14:11:44 +10:00
Jamie Curnow 2c5eac9dad Merge branch 'master' of github.com:jc21/nginx-proxy-manager into develop 2020-09-03 14:03:43 +10:00
jc21 87f61b8527 Merge pull request #572 from jipjan/features/dns-cloudflare 
Add DNS CloudFlare with wildcard support
 2020-09-03 14:01:05 +10:00
jc21 74bfe490c6 Merge pull request #587 from duhruh/bug/custom-ssl-inputs 
Allow inputs to update
 2020-09-03 13:53:17 +10:00
jc21 4bafc7ff1a Merge pull request #546 from jc21/dependabot/npm_and_yarn/docs/prismjs-1.21.0 
Bump prismjs from 1.20.0 to 1.21.0 in /docs
 2020-08-25 10:51:11 +10:00
jc21 bf8beb50b4 Merge pull request #559 from jlesage/remove-webroot-certbot-arg 
Removed the hardcoded `--webroot` certbot argument to better support DNS challenge
 2020-08-25 08:44:00 +10:00
jc21 e5034a34f5 Merge pull request #570 from jc21/dependabot/npm_and_yarn/backend/bcrypt-5.0.0 
Bump bcrypt from 4.0.1 to 5.0.0 in /backend
 2020-08-25 08:31:48 +10:00
jc21 6694a42270 Merge pull request #560 from jlesage/remove-from-unixtime 
Removed usage of `FROM_UNIXTIME` mysql-specific function.
 2020-08-21 14:21:40 +10:00
Jamie Curnow 5d65166777 Ignore local subnets for real IP determination 2020-08-12 09:32:40 +10:00
jc21 d68656559c Merge pull request #544 from jlesage/sqlite-now-helper-fix 
Fixed now_helper for sqlite (time is missing)
 2020-08-07 08:37:00 +10:00
jc21 74010acd85 Merge pull request #543 from jc21/develop 
v2.4.0
 2020-08-06 16:00:10 +10:00
Jamie Curnow 7c7d255172 Added another contributor 2020-08-06 14:46:19 +10:00
jc21 058f1e9835 Merge pull request #464 from vrenjith/patch-1 
Update location-item.ejs - forward_host size increase to 200
 2020-08-06 14:45:09 +10:00
Jamie Curnow b4fc629ec0 Bumped version 2020-08-06 14:43:34 +10:00