DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse source
This commit is contained in:
snipe 2021-05-07 16:42:41 -07:00
parent 570a31a1c4 a704614397
commit 75b89b5a97
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile.alpine
View file

@ -1,4 +1,4 @@
FROM alpine:3.12 FROM alpine:3.13
# Apache + PHP # Apache + PHP
RUN apk add --no-cache \ RUN apk add --no-cache \
apache2 \ apache2 \

2
app/Http/Middleware/SecurityHeaders.php
View file

@ -99,7 +99,7 @@ class SecurityHeaders
// We have to exclude debug mode here because debugbar pulls from a CDN or two // We have to exclude debug mode here because debugbar pulls from a CDN or two
// and it will break things. // and it will break things.
if ((config('app.debug')!='true') || (config('app.enable_csp')=='true')) { if ((config('app.debug')!='true') && (config('app.enable_csp')=='true')) {
$csp_policy[] = "default-src 'self'"; $csp_policy[] = "default-src 'self'";
$csp_policy[] = "style-src 'self' 'unsafe-inline'"; $csp_policy[] = "style-src 'self' 'unsafe-inline'";
$csp_policy[] = "script-src 'self' 'unsafe-inline' 'unsafe-eval'"; $csp_policy[] = "script-src 'self' 'unsafe-inline' 'unsafe-eval'";

2
app/Models/Location.php
View file

@ -23,7 +23,7 @@ class Location extends SnipeModel
protected $rules = array( protected $rules = array(
'name' => 'required|min:2|max:255|unique_undeleted', 'name' => 'required|min:2|max:255|unique_undeleted',
'city' => 'min:2|max:255|nullable', 'city' => 'min:2|max:255|nullable',
'country' => 'min:2|max:2|nullable', 'country' => 'min:2|max:255|nullable',
'address' => 'max:80|nullable', 'address' => 'max:80|nullable',
'address2' => 'max:80|nullable', 'address2' => 'max:80|nullable',
'zip' => 'min:3|max:10|nullable', 'zip' => 'min:3|max:10|nullable',

1
resources/views/settings/backups.blade.php
View file

@ -30,7 +30,6 @@
id="system-backups" id="system-backups"
class="table table-striped snipe-table"> class="table table-striped snipe-table">
<thead> <thead>
<thead>
<th>File</th> <th>File</th>
<th>Created</th> <th>Created</th>
<th>Size</th> <th>Size</th>