Resolve Merge Conflicts #1
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the generated keys appear to be for JWT, not GPG
Add DNS Provider TimeWeb Cloud
Update README.md
Updated certbot-dns-websupport plugin to 2.0.1 NginxProxyManager#3447
…ndabot/npm_and_yarn/docs/vite-5.0.12 Bump vite from 5.0.11 to 5.0.12 in /docs
Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](indutny/node-ip@v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
chown -R tries to chown all files. find -not -user -execdir only chowns files not owned by PUID
Pinned certbot-dns-godaddy at 2.8.0
Credit to original PR NginxProxyManager#2402
Bumps [express](https://github.com/expressjs/express) from 4.17.3 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](expressjs/express@4.17.3...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.12 to 5.0.13. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v5.0.13/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.0.13/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Latest plugin version with several fixes
Bumps [tar](https://github.com/isaacs/node-tar) from 6.1.11 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](isaacs/node-tar@v6.1.11...v6.2.1) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
Bumps [tar](https://github.com/isaacs/node-tar) from 6.2.0 to 6.2.1. - [Release notes](https://github.com/isaacs/node-tar/releases) - [Changelog](https://github.com/isaacs/node-tar/blob/main/CHANGELOG.md) - [Commits](isaacs/node-tar@v6.2.0...v6.2.1) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]>
…ndabot/npm_and_yarn/docs/tar-6.2.1 Bump tar from 6.2.0 to 6.2.1 in /docs
…ndabot/npm_and_yarn/frontend/tar-6.2.1 Bump tar from 6.1.11 to 6.2.1 in /frontend
…ndabot/npm_and_yarn/docs/vite-5.0.13 Bump vite from 5.0.12 to 5.0.13 in /docs
…ndabot/npm_and_yarn/backend/express-4.19.2 Bump express from 4.17.3 to 4.19.2 in /backend
…t-dns-transip fix: update certbot-dns-transip to latest version
Update certbot-dns-goddaddy
…rtup replaced chown with find -not -user -execdir chown
…-dns-infomaniak Update certbot-dns-infomaniak
…ertbot-dns-strato fix: update certbot-dns-strato to latest version
Update certbot-dns-duckdns version (fix NginxProxyManager#2994)
and updated cypress + packages
…am-ssl SSL for Streams - 2025
…xpires-type Fix type for token.expires
…-patch Update certbot-dns-plugins.json (mijn-host)
…ctive-host-in-cert-list SSL Certificates: Show if cert is in use on host
feat: change htpasswd to openssl
…offensive-certbot-plugin Update DomainOffensive certbot plugin
…ne-edit-certbot-plugin Add ZoneEdit certbot plugin
…urity-schemes-component API Schema Improvements
…oxy-manager into develop # Conflicts: # backend/schema/endpoints/proxy-hosts.json # backend/templates/_listen.conf
|
maybe you should just try to make a new PR and see if it gets accepted @adrum ? I've been wanting this as well |
|
@adrum yeah but it's been 2 weeks, how long are you gonna wait xD? Only reason I want this is because the incoming connection IPs get masked by Docker for my nginx proxy manager :( On Linux everything just works :\ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will hopefully allow NginxProxyManager#1882 to be merged