From 288086c78d535289b3cec8ab0e0afdeacc053e62 Mon Sep 17 00:00:00 2001 From: Jocelyn Le Sage Date: Tue, 20 Aug 2019 20:52:00 -0400 Subject: [PATCH 1/4] Selection of the ssl protocols/ciphers is done using the default server block. (#189) --- rootfs/etc/nginx/conf.d/default.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rootfs/etc/nginx/conf.d/default.conf b/rootfs/etc/nginx/conf.d/default.conf index 2530ec2e..9af28ed2 100644 --- a/rootfs/etc/nginx/conf.d/default.conf +++ b/rootfs/etc/nginx/conf.d/default.conf @@ -47,7 +47,7 @@ server { ssl_certificate /data/nginx/dummycert.pem; ssl_certificate_key /data/nginx/dummykey.pem; - ssl_ciphers aNULL; + include conf.d/include/ssl-ciphers.conf; return 444; } From a215958cec585339292658b9105dea945ece7582 Mon Sep 17 00:00:00 2001 From: Steven Harris Date: Tue, 3 Sep 2019 23:40:59 -0500 Subject: [PATCH 2/4] Fix wrap for tags (#195) --- src/frontend/js/app/nginx/certificates/list/item.ejs | 2 +- src/frontend/scss/custom.scss | 5 +++++ src/frontend/scss/tabler-extra.scss | 5 +++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/frontend/js/app/nginx/certificates/list/item.ejs b/src/frontend/js/app/nginx/certificates/list/item.ejs index dd794052..e7ee2165 100644 --- a/src/frontend/js/app/nginx/certificates/list/item.ejs +++ b/src/frontend/js/app/nginx/certificates/list/item.ejs @@ -4,7 +4,7 @@ -
+
<% if (provider === 'letsencrypt') { domain_names.map(function(host) { diff --git a/src/frontend/scss/custom.scss b/src/frontend/scss/custom.scss index 157d020f..ff997da3 100644 --- a/src/frontend/scss/custom.scss +++ b/src/frontend/scss/custom.scss @@ -27,3 +27,8 @@ a:hover { .card-options .dropdown-menu a:not(.btn) { margin-left: 0; } + +.wrap { + display: flex; + flex-wrap: wrap; +} diff --git a/src/frontend/scss/tabler-extra.scss b/src/frontend/scss/tabler-extra.scss index 27567446..cb2dcbb6 100644 --- a/src/frontend/scss/tabler-extra.scss +++ b/src/frontend/scss/tabler-extra.scss @@ -3,6 +3,11 @@ $yellow: #f1c40f; $blue: #467fcf; $pink: #f66d9b; +.tag { + margin-bottom: .5em; + margin-right: .5em; +} + .tag.hover-green:hover, .tag.hover-green:active, .tag.hover-green:focus { background-color: #5eba00; cursor: pointer; From 13767d13d65c45698ce21b6e86a659ff5d65fc89 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 4 Sep 2019 14:41:48 +1000 Subject: [PATCH 3/4] Version bump --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index e4d3e2a3..e35e6b6d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nginx-proxy-manager", - "version": "2.0.13", + "version": "2.0.14", "description": "A beautiful interface for creating Nginx endpoints", "main": "src/backend/index.js", "devDependencies": { From 7d6c6129f22f5d1c042d7ac5a5a81f101f66cf9d Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Thu, 5 Sep 2019 08:25:30 +1000 Subject: [PATCH 4/4] Updated readme versions --- README.md | 2 +- doc/DOCKERHUB.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 589b0c83..3fb7016d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Nginx Proxy Manager -![Version](https://img.shields.io/badge/version-2.0.13-green.svg?style=for-the-badge) +![Version](https://img.shields.io/badge/version-2.0.14-green.svg?style=for-the-badge) ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge) ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge) diff --git a/doc/DOCKERHUB.md b/doc/DOCKERHUB.md index 0e1edcea..1aa1b439 100644 --- a/doc/DOCKERHUB.md +++ b/doc/DOCKERHUB.md @@ -2,7 +2,7 @@ # [Nginx Proxy Manager](https://nginxproxymanager.jc21.com) -![Version](https://img.shields.io/badge/version-2.0.13-green.svg?style=for-the-badge) +![Version](https://img.shields.io/badge/version-2.0.14-green.svg?style=for-the-badge) ![Stars](https://img.shields.io/docker/stars/jc21/nginx-proxy-manager.svg?style=for-the-badge) ![Pulls](https://img.shields.io/docker/pulls/jc21/nginx-proxy-manager.svg?style=for-the-badge)