From ecb4d0d9486cabf1a42dbe0306f2dd2d037c1e4a Mon Sep 17 00:00:00 2001 From: Svpernova09 Date: Tue, 2 Dec 2014 06:51:50 -0600 Subject: [PATCH 1/3] Add jetbrains IDE's config folders to gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 690bf5f7a0..3711b98664 100755 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,5 @@ public/uploads/avatars/* /app/storage/views/* /app/storage/logs/* /app/storage/debugbar/ -/bin/ \ No newline at end of file +/bin/ +.idea \ No newline at end of file From cc8ca54b3f9b2d6deec0d5fb6652ad8d5c426318 Mon Sep 17 00:00:00 2001 From: Svpernova09 Date: Tue, 2 Dec 2014 06:59:01 -0600 Subject: [PATCH 2/3] Convert note fields to text areas for hardware views --- app/views/backend/hardware/checkin.blade.php | 1 + app/views/backend/hardware/checkout.blade.php | 2 +- app/views/backend/hardware/clone.blade.php | 2 +- app/views/backend/hardware/edit.blade.php | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php index 4f119903d4..2f58646e67 100755 --- a/app/views/backend/hardware/checkin.blade.php +++ b/app/views/backend/hardware/checkin.blade.php @@ -44,6 +44,7 @@
+ {{ $errors->first('note', ' :message') }}
diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php index 81b64f26b4..afba319e10 100755 --- a/app/views/backend/hardware/checkout.blade.php +++ b/app/views/backend/hardware/checkout.blade.php @@ -58,7 +58,7 @@
- + {{ $errors->first('note', ' :message') }}
diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php index e3ab009559..90aea63470 100755 --- a/app/views/backend/hardware/clone.blade.php +++ b/app/views/backend/hardware/clone.blade.php @@ -126,7 +126,7 @@
- + {{ $errors->first('notes', ' :message') }}
diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index 844287511e..c1151f8977 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -149,7 +149,7 @@
- + {{ $errors->first('notes', ' :message') }}
From 7849320db096d26a8cbb02dabca414e3f67f8988 Mon Sep 17 00:00:00 2001 From: Svpernova09 Date: Tue, 2 Dec 2014 06:59:16 -0600 Subject: [PATCH 3/3] Convert note fields to text areas for licenses views --- app/views/backend/licenses/checkin.blade.php | 2 +- app/views/backend/licenses/checkout.blade.php | 2 +- app/views/backend/licenses/edit.blade.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/backend/licenses/checkin.blade.php b/app/views/backend/licenses/checkin.blade.php index 55a59477ec..92c0113a87 100755 --- a/app/views/backend/licenses/checkin.blade.php +++ b/app/views/backend/licenses/checkin.blade.php @@ -46,7 +46,7 @@
- + {{ $errors->first('note', ' :message') }}
diff --git a/app/views/backend/licenses/checkout.blade.php b/app/views/backend/licenses/checkout.blade.php index 362713bf8f..d19e332eca 100755 --- a/app/views/backend/licenses/checkout.blade.php +++ b/app/views/backend/licenses/checkout.blade.php @@ -76,7 +76,7 @@
- + {{ $errors->first('note', ' :message') }}
diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php index 0f604176d6..f7ba31a716 100755 --- a/app/views/backend/licenses/edit.blade.php +++ b/app/views/backend/licenses/edit.blade.php @@ -156,7 +156,7 @@
- + {{ $errors->first('notes', ' :message') }}