Skip to content

v2.2.1 #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 6, 2020
Merged

v2.2.1 #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
41f16c2
Bump minimist from 1.2.0 to 1.2.2 in /docs
dependabot[bot] Mar 18, 2020
3e7d2b2
Update proxy_host.conf
damianog Mar 27, 2020
701ef18
Update README.md
IronTooch Apr 2, 2020
b7467c1
Update README.md
IronTooch Apr 2, 2020
baaf39c
Bump acorn from 7.1.0 to 7.1.1 in /test
dependabot[bot] Apr 4, 2020
b09f201
Bump acorn from 7.1.0 to 7.1.1 in /backend
dependabot[bot] Apr 4, 2020
632ee2d
Merge pull request #348 from jc21/dependabot/npm_and_yarn/backend/aco…
jc21 Apr 5, 2020
2d9486b
Merge pull request #347 from jc21/dependabot/npm_and_yarn/test/acorn-…
jc21 Apr 5, 2020
e4286c9
Merge pull request #342 from damianog/patch-1
jc21 Apr 5, 2020
33c2c13
Merge pull request #345 from IronTooch/master
jc21 Apr 5, 2020
2a2d3d5
Version bump
jc21 Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.0
2.2.1
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<p align="center">
<img src="https://nginxproxymanager.com/github.png">
<br><br>
<img src="https://img.shields.io/badge/version-2.2.0-green.svg?style=for-the-badge">
<img src="https://img.shields.io/badge/version-2.2.1-green.svg?style=for-the-badge">
<a href="https://hub.docker.com/repository/docker/jc21/nginx-proxy-manager">
<img src="https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge">
</a>
Expand Down
2 changes: 1 addition & 1 deletion backend/templates/proxy_host.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ server {

{% if allow_websocket_upgrade == 1 or allow_websocket_upgrade == true %}
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade";
proxy_set_header Connection $http_connection;
proxy_http_version 1.1;
{% endif %}

Expand Down
6 changes: 3 additions & 3 deletions backend/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ acorn-jsx@^5.1.0:
integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==

acorn@^7.1.0:
version "7.1.0"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
version "7.1.1"
resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==

ajv@^6.10.0, ajv@^6.10.2, ajv@^6.11.0:
version "6.11.0"
Expand Down
3 changes: 2 additions & 1 deletion docs/setup/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Don't worry, this is easy to do.

The app requires a configuration file to let it know what database you're using.
The app requires a configuration file to let it know what database you're using. By default, this file is called config.json.

Here's an example configuration for `mysql` (or mariadb) that is compatible with the docker-compose example below:

Expand Down Expand Up @@ -88,6 +88,7 @@ Then:
docker-compose up -d
```

The config file (config.json) must be present in this directory.

### Running on Raspberry PI / ARM devices

Expand Down
6 changes: 3 additions & 3 deletions docs/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4928,9 +4928,9 @@ minimist@0.0.8:
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=

minimist@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
version "1.2.2"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.2.tgz#b00a00230a1108c48c169e69a291aafda3aacd63"
integrity sha512-rIqbOrKb8GJmx/5bc2M0QchhUouMXSpd1RTclXsB41JdL+VtnojfaJR+h7F9k18/4kHUsBFgk80Uk+q569vjPA==

mississippi@^3.0.0:
version "3.0.0"
Expand Down
Loading