From 6273e313bc4acb5fd1a24651c5e6474a39097be8 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 3 Dec 2016 17:33:36 -0800 Subject: [PATCH 1/3] Set DB_SSL to false for config --- .env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.example b/.env.example index 37780477b..aa1ac2d29 100644 --- a/.env.example +++ b/.env.example @@ -23,7 +23,7 @@ DB_DUMP_PATH='/usr/bin' # -------------------------------------------- # OPTIONAL: SSL DATABASE SETTINGS # -------------------------------------------- -DB_SSL=true +DB_SSL=false DB_SSL_KEY_PATH=null DB_SSL_CERT_PATH=null DB_SSL_CA_PATH=null From dd52b4828c1abd795b020046dfc63b5aa56c9516 Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Mon, 5 Dec 2016 15:08:37 -0800 Subject: [PATCH 2/3] Make .gitignore and .gitkeep files permissions match their directories (#3018) --- storage/app/.gitignore | 0 storage/app/backups/.gitignore | 0 storage/debugbar/.gitignore | 0 storage/framework/.gitignore | 0 storage/framework/cache/.gitignore | 0 storage/framework/sessions/.gitignore | 0 storage/framework/views/.gitignore | 0 storage/logs/.gitignore | 0 storage/private_uploads/assetmodels/.gitignore | 0 storage/private_uploads/assets/.gitignore | 0 storage/private_uploads/imports/.gitignore | 0 storage/private_uploads/licenses/.gitignore | 0 storage/private_uploads/users/.gitkeep | 0 13 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 storage/app/.gitignore mode change 100644 => 100755 storage/app/backups/.gitignore mode change 100644 => 100755 storage/debugbar/.gitignore mode change 100644 => 100755 storage/framework/.gitignore mode change 100644 => 100755 storage/framework/cache/.gitignore mode change 100644 => 100755 storage/framework/sessions/.gitignore mode change 100644 => 100755 storage/framework/views/.gitignore mode change 100644 => 100755 storage/logs/.gitignore mode change 100644 => 100755 storage/private_uploads/assetmodels/.gitignore mode change 100644 => 100755 storage/private_uploads/assets/.gitignore mode change 100644 => 100755 storage/private_uploads/imports/.gitignore mode change 100644 => 100755 storage/private_uploads/licenses/.gitignore mode change 100644 => 100755 storage/private_uploads/users/.gitkeep diff --git a/storage/app/.gitignore b/storage/app/.gitignore old mode 100644 new mode 100755 diff --git a/storage/app/backups/.gitignore b/storage/app/backups/.gitignore old mode 100644 new mode 100755 diff --git a/storage/debugbar/.gitignore b/storage/debugbar/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/.gitignore b/storage/framework/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/cache/.gitignore b/storage/framework/cache/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/sessions/.gitignore b/storage/framework/sessions/.gitignore old mode 100644 new mode 100755 diff --git a/storage/framework/views/.gitignore b/storage/framework/views/.gitignore old mode 100644 new mode 100755 diff --git a/storage/logs/.gitignore b/storage/logs/.gitignore old mode 100644 new mode 100755 diff --git a/storage/private_uploads/assetmodels/.gitignore b/storage/private_uploads/assetmodels/.gitignore old mode 100644 new mode 100755 diff --git a/storage/private_uploads/assets/.gitignore b/storage/private_uploads/assets/.gitignore old mode 100644 new mode 100755 diff --git a/storage/private_uploads/imports/.gitignore b/storage/private_uploads/imports/.gitignore old mode 100644 new mode 100755 diff --git a/storage/private_uploads/licenses/.gitignore b/storage/private_uploads/licenses/.gitignore old mode 100644 new mode 100755 diff --git a/storage/private_uploads/users/.gitkeep b/storage/private_uploads/users/.gitkeep old mode 100644 new mode 100755 From 927a12f78ddd0f43a96c1663b48acce591622d04 Mon Sep 17 00:00:00 2001 From: Daniel Meltzer Date: Mon, 5 Dec 2016 17:09:14 -0600 Subject: [PATCH 3/3] Fix #2985. Missed in the field rename (#3014) --- app/Http/Controllers/AssetModelsController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php index 58d9cc8b4..e4cec1fcc 100755 --- a/app/Http/Controllers/AssetModelsController.php +++ b/app/Http/Controllers/AssetModelsController.php @@ -145,7 +145,7 @@ class AssetModelsController extends Controller $model->category_id = e(Input::get('category_id')); $model->model_number = e(Input::get('model_number')); $model->user_id = Auth::user()->id; - $model->note = e(Input::get('note')); + $model->notes = e(Input::get('notes')); $model->eol= null; if (Input::get('fieldset_id')=='') {