From ed5823151bfafde02b85f70d5221ec8d9a8e0b21 Mon Sep 17 00:00:00 2001 From: thelamer Date: Thu, 7 Jun 2018 22:29:00 -0700 Subject: [PATCH 1/4] in order to avoid manual user intervention of running "php artisan migrate" before installation on a clean database pulling in migration scripts on startup if needed, also ownership of keys needs to be the docker user --- docker/entrypoint.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2fc2242649..0486302c93 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -17,12 +17,18 @@ else fi # create data directories -for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/categories' 'data/uploads/companies' 'data/uploads/departments' 'data/uploads/locations' 'data/uploads/manufacturers' 'data/uploads/models' 'data/uploads/suppliers' 'dumps'; do +for dir in 'data/private_uploads' 'data/uploads' 'data/uploads/avatars' 'data/uploads/barcodes' 'data/uploads/categories' 'data/uploads/companies' 'data/uploads/departments' 'data/uploads/locations' 'data/uploads/manufacturers' 'data/uploads/models' 'data/uploads/suppliers' 'dumps' 'keys'; do mkdir -p "/var/lib/snipeit/$dir" done chown -R docker:root /var/lib/snipeit/data/* chown -R docker:root /var/lib/snipeit/dumps +chown -R docker:root /var/lib/snipeit/keys + +# If the Oauth DB files are not present copy the vendor files over to the db migrations +if [ ! -f "/var/www/html/database/migrations/*create_oauth*" ]; then + cp -ax /var/www/html/vendor/laravel/passport/database/migrations/* /var/www/html/database/migrations/ +fi . /etc/apache2/envvars exec apache2 -DNO_DETACH < /dev/null From 1ee394aa695e3f1868847d039625255d8f1f8723 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 21 Jun 2018 07:40:30 -0700 Subject: [PATCH 2/4] Added Select2 to class for dropdowns --- resources/views/settings/branding.blade.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index 2c9ffad12b..c5a56f65ab 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -88,7 +88,7 @@ {{ Form::label('brand', trans('admin/settings/general.brand')) }}
- {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), Input::old('brand', $setting->brand), array('class' => 'form-control', 'style'=>'width: 150px ;')) !!} + {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), Input::old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} {!! $errors->first('brand', ':message') !!}
@@ -158,9 +158,9 @@
@if (config('app.lock_passwords')===true) - {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('support_footer', $setting->support_footer), ['class' => 'form-control disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!} + {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('support_footer', $setting->support_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!} @else - {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('support_footer', $setting->support_footer), array('class' => 'form-control', 'style'=>'width: 150px ;')) !!} + {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('support_footer', $setting->support_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} @endif

{{ trans('admin/settings/general.support_footer_help') }}

@@ -176,9 +176,9 @@
@if (config('app.lock_passwords')===true) - {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), ['class' => 'form-control disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!} + {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!} @else - {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), array('class' => 'form-control', 'style'=>'width: 150px ;')) !!} + {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), Input::old('version_footer', $setting->version_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!} @endif

{{ trans('admin/settings/general.version_footer_help') }}

From fde4a595108af273ba80fc58d0a4b4c0928cb755 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 21 Jun 2018 07:40:37 -0700 Subject: [PATCH 3/4] Bumped version --- config/version.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/version.php b/config/version.php index bdfd9ffde7..729a985f5c 100644 --- a/config/version.php +++ b/config/version.php @@ -1,10 +1,10 @@ 'v4.4.1', - 'full_app_version' => 'v4.4.1 - build 3636-gece916e12', - 'build_version' => '3636', + 'app_version' => 'v4.4.2', + 'full_app_version' => 'v4.4.2 - build 3666-gaa5003d29', + 'build_version' => '3666', 'prerelease_version' => '', - 'hash_version' => 'gece916e12', - 'full_hash' => 'v4.4.1-54-gece916e12', - 'branch' => 'master', -); + 'hash_version' => 'gaa5003d29', + 'full_hash' => 'v4.4.1-28-gaa5003d29', + 'branch' => 'develop', +); \ No newline at end of file From eb412c2bcbc25b6be2a5e426332fb418ddabb955 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 21 Jun 2018 07:43:12 -0700 Subject: [PATCH 4/4] Missed one --- config/version.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/version.php b/config/version.php index 729a985f5c..eb41c8c793 100644 --- a/config/version.php +++ b/config/version.php @@ -5,6 +5,6 @@ return array ( 'build_version' => '3666', 'prerelease_version' => '', 'hash_version' => 'gaa5003d29', - 'full_hash' => 'v4.4.1-28-gaa5003d29', + 'full_hash' => 'v4.4.2-28-gaa5003d29', 'branch' => 'develop', -); \ No newline at end of file +);