Merge from develop v2.0.14 release (#196)

* Selection of the ssl protocols/ciphers is done using the default server block. (#189)
* Fix wrap for tags (#195)
This commit is contained in:
jc21 2019-09-04 14:51:24 +10:00 committed by GitHub
parent 31aa9c9644
commit 0bc12f3bdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 3 deletions

View File

@ -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": {

View File

@ -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;
}

View File

@ -4,7 +4,7 @@
</div>
</td>
<td>
<div>
<div class="wrap">
<%
if (provider === 'letsencrypt') {
domain_names.map(function(host) {

View File

@ -27,3 +27,8 @@ a:hover {
.card-options .dropdown-menu a:not(.btn) {
margin-left: 0;
}
.wrap {
display: flex;
flex-wrap: wrap;
}

View File

@ -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;