DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'snipe-origin/develop' into develop

Browse source
This commit is contained in:
Wes Hulette 2018-09-29 11:30:33 -04:00
parent b09afef46f 153a711de4
commit 5cb6744c1b
6 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -56,3 +56,4 @@ tests/_support/_generated/*
\.php_cs\.dist \.php_cs\.dist
phpmd\.xml phpmd\.xml
/public/storage

2
app/Models/CustomFieldset.php
View file

@ -15,7 +15,7 @@ class CustomFieldset extends Model
* Validation rules * Validation rules
* @var array * @var array
*/ */
protected $rules = [ public $rules = [
"name" => "required|unique:custom_fieldsets" "name" => "required|unique:custom_fieldsets"
]; ];

BIN
public/css/all.css
View file

Binary file not shown.

2
public/mix-manifest.json
View file

@ -5,7 +5,7 @@
"/js/build/vue.js.map": "/js/build/vue.js.map?id=3aae6e8f609e5cd2842a", "/js/build/vue.js.map": "/js/build/vue.js.map?id=3aae6e8f609e5cd2842a",
"/css/build/AdminLTE.css.map": "/css/build/AdminLTE.css.map?id=fa40c591a5b361cb0761", "/css/build/AdminLTE.css.map": "/css/build/AdminLTE.css.map?id=fa40c591a5b361cb0761",
"/css/build/app.css.map": "/css/build/app.css.map?id=5a1bc8c3be0d3da37d0a", "/css/build/app.css.map": "/css/build/app.css.map?id=5a1bc8c3be0d3da37d0a",
"/css/all.css": "/css/all.css?id=d4da88a066c39e0ef7d0", "/css/all.css": "/css/all.css?id=0a9b14700366dedbfab4",
"/css/skins/skin-green-dark.min.css": "/css/skins/skin-green-dark.min.css?id=1039ae0e198a7f3d8da7", "/css/skins/skin-green-dark.min.css": "/css/skins/skin-green-dark.min.css?id=1039ae0e198a7f3d8da7",
"/css/skins/skin-orange-dark.min.css": "/css/skins/skin-orange-dark.min.css?id=9a461970f7ab07f40847", "/css/skins/skin-orange-dark.min.css": "/css/skins/skin-orange-dark.min.css?id=9a461970f7ab07f40847",
"/css/skins/skin-red-dark.min.css": "/css/skins/skin-red-dark.min.css?id=99f90bbd653d7db10795", "/css/skins/skin-red-dark.min.css": "/css/skins/skin-red-dark.min.css?id=99f90bbd653d7db10795",

2
resources/views/layouts/basic.blade.php
View file

@ -12,7 +12,7 @@
<!-- Select2 --> <!-- Select2 -->
<link rel="stylesheet" href="{{ url(asset('js/plugins/select2/select2.min.css')) }}"> <link rel="stylesheet" href="{{ url(asset('js/plugins/select2/select2.min.css')) }}">
<link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}"> <link rel="stylesheet" href="{{ url(mix('css/all.css')) }}">
<link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}"> <link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}">

2
webpack.mix.js
View file

@ -12,8 +12,8 @@ mix
.less("./resources/assets/less/app.less", "css/build") .less("./resources/assets/less/app.less", "css/build")
.styles( .styles(
[ [
"./public/css/build/AdminLTE.css",
"./node_modules/select2/dist/css/select2.css", "./node_modules/select2/dist/css/select2.css",
"./public/css/build/AdminLTE.css",
"./node_modules/admin-lte/plugins/iCheck/minimal/blue.css", "./node_modules/admin-lte/plugins/iCheck/minimal/blue.css",
"./node_modules/font-awesome/css/font-awesome.css", "./node_modules/font-awesome/css/font-awesome.css",
"./node_modules/icheck/skins/minimal/minimal.css", "./node_modules/icheck/skins/minimal/minimal.css",