Mirrored_Repos/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/jc21/nginx-proxy-manager.git synced 2024-08-30 18:22:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge from develop v2.0.14 release (#196)

Browse Source 
* 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "nginx-proxy-manager", "name": "nginx-proxy-manager",
"version": "2.0.13", "version": "2.0.14",
"description": "A beautiful interface for creating Nginx endpoints", "description": "A beautiful interface for creating Nginx endpoints",
"main": "src/backend/index.js", "main": "src/backend/index.js",
"devDependencies": { "devDependencies": {

2
rootfs/etc/nginx/conf.d/default.conf
View File

@ -47,7 +47,7 @@ server {
ssl_certificate /data/nginx/dummycert.pem; ssl_certificate /data/nginx/dummycert.pem;
ssl_certificate_key /data/nginx/dummykey.pem; ssl_certificate_key /data/nginx/dummykey.pem;
ssl_ciphers aNULL; include conf.d/include/ssl-ciphers.conf;
return 444; return 444;
} }

2
src/frontend/js/app/nginx/certificates/list/item.ejs
View File

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

5
src/frontend/scss/custom.scss
View File

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

5
src/frontend/scss/tabler-extra.scss
View File

@ -3,6 +3,11 @@ $yellow: #f1c40f;
$blue: #467fcf; $blue: #467fcf;
$pink: #f66d9b; $pink: #f66d9b;
.tag {
margin-bottom: .5em;
margin-right: .5em;
}
.tag.hover-green:hover, .tag.hover-green:active, .tag.hover-green:focus { .tag.hover-green:hover, .tag.hover-green:active, .tag.hover-green:focus {
background-color: #5eba00; background-color: #5eba00;
cursor: pointer; cursor: pointer;