From 84317f7f5077c30afdb632cb9b6972c9a5fe7432 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 6 Dec 2016 11:50:20 -0800 Subject: [PATCH 1/9] Fixes #2990 - disabled autocomplete on login --- resources/views/auth/login.blade.php | 4 ++-- resources/views/users/edit.blade.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 5b15f3bec..39881a0a6 100755 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -4,7 +4,7 @@ {{-- Page content --}} @section('content') -
+
@@ -35,7 +35,7 @@ {!! $errors->first('username', ' :message') !!}
- + {!! $errors->first('password', ' :message') !!}
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 7d49c734a..0b7e1a09d 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -117,7 +117,7 @@ name="username" id="username" value="{{ Input::old('username', $user->username) }}" - autocomplete="false" + autocomplete="off" readonly onfocus="this.removeAttribute('readonly');" {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }} @@ -146,7 +146,7 @@ class="form-control" id="password" value="" - autocomplete="false" + autocomplete="off" readonly onfocus="this.removeAttribute('readonly');" {{ ((config('app.lock_passwords') && ($user->id)) ? ' disabled' : '') }} From f26d86dff2e010afb301da39b669deb59e1f3e2f Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 7 Dec 2016 17:06:48 -0800 Subject: [PATCH 2/9] Updated gulpfile --- gulpfile.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 20389efb9..69741dfad 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,5 +1,5 @@ var elixir = require('laravel-elixir'); -require('laravel-elixir-codeception'); +require('laravel-elixir-codeception-standalone'); /* |-------------------------------------------------------------------------- | Elixir Asset Management @@ -38,7 +38,7 @@ elixir(function(mix) { mix.version(['assets/css/app.css','assets/js/all.js']); - mix.codeception(); + mix.codeception(null, { flags: '--report' }); From 899a991a3b47672fb7413c4e45f94e16543119d4 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 7 Dec 2016 17:07:07 -0800 Subject: [PATCH 3/9] Added package.json --- package.json | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 000000000..e641044dc --- /dev/null +++ b/package.json @@ -0,0 +1,21 @@ +{ + "private": true, + "scripts": { + "prod": "gulp --production", + "dev": "gulp watch" + }, + "devDependencies": { + "bootstrap-sass": "^3.3.7", + "gulp": "^3.9.1", + "jquery": "^3.1.0", + "laravel-elixir": "^6.0.0-11", + "laravel-elixir-vue-2": "^0.2.0", + "laravel-elixir-webpack-official": "^1.0.2", + "lodash": "^4.16.2", + "vue": "^2.0.1", + "vue-resource": "^1.0.3" + }, + "dependencies": { + "laravel-elixir-codeception": "^0.2.0" + } +} From e7ac860f77603c4b296a48dbff664c3d0f2ecc7e Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 7 Dec 2016 17:07:48 -0800 Subject: [PATCH 4/9] =?UTF-8?q?Supress=20error=20if=20pagination=20isn?= =?UTF-8?q?=E2=80=99t=20set=20up=20on=20the=20server?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Models/Ldap.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php index a9cb4dbbf..fe5ee173e 100644 --- a/app/Models/Ldap.php +++ b/app/Models/Ldap.php @@ -277,7 +277,7 @@ class Ldap extends Model $global_count += $results['count']; $result_set = array_merge($result_set, $results); - ldap_control_paged_result_response($ldapconn, $search_results, $cookie); + @ldap_control_paged_result_response($ldapconn, $search_results, $cookie); } while ($cookie !== null && $cookie != ''); From 32c5a258a7463706ff25f6a8eefe5d17c382e926 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 7 Dec 2016 17:14:48 -0800 Subject: [PATCH 5/9] Updated hash --- config/version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/version.php b/config/version.php index bb2e1941f..7703721e5 100644 --- a/config/version.php +++ b/config/version.php @@ -3,5 +3,5 @@ return array ( 'app_version' => 'v3.6.2', 'build_version' => '10', 'hash_version' => 'g927a12f', - 'full_hash' => 'v3.6.1-10-g927a12f', + 'full_hash' => 'v3.6.2-10-g899a991', ); From ae66bba0f12dd82a8f5c6ff5d3da485bd81056c5 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 7 Dec 2016 17:50:20 -0800 Subject: [PATCH 6/9] Fixes #3015 - increase size of state field in suppliers --- app/Models/Supplier.php | 2 +- ...20_increase_size_of_state_in_suppliers.php | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php index 72717f754..439fb4273 100755 --- a/app/Models/Supplier.php +++ b/app/Models/Supplier.php @@ -18,7 +18,7 @@ class Supplier extends SnipeModel 'address' => 'min:3|max:50', 'address2' => 'min:2|max:50', 'city' => 'min:3|max:255', - 'state' => 'min:0|max:2', + 'state' => 'min:0|max:32', 'country' => 'min:0|max:2', 'fax' => 'min:7|max:20', 'phone' => 'min:7|max:20', diff --git a/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php b/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php new file mode 100644 index 000000000..1c1468d23 --- /dev/null +++ b/database/migrations/2016_12_07_173720_increase_size_of_state_in_suppliers.php @@ -0,0 +1,31 @@ +string('state', 32)->nullable()->default(null)->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('suppliers', function ($table) { + $table->string('state', 2)->nullable()->default(null)->change(); + }); + } +} From 6f1e0d6d9fb80681cfd26a35cb039c3031720067 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 12 Dec 2016 19:03:12 -0800 Subject: [PATCH 7/9] Updated readme with security notice --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 2550a6c25..370567157 100644 --- a/README.md +++ b/README.md @@ -53,3 +53,7 @@ Please see the documentation on [contributing and developing for Snipe-IT](https Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. + +### Security + +To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker. From 95f1a98b96a758d7d90e680e862cc3ef51bf21d7 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 12 Dec 2016 19:03:45 -0800 Subject: [PATCH 8/9] Removed extraneous closing label tags --- resources/views/hardware/edit.blade.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index e057edf46..089c50ad6 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -15,7 +15,6 @@
-
@if ($item->id) @@ -30,7 +29,6 @@
-
@if (isset($selected_model)) {{ Form::select('model_id', $model_list , $selected_model->id, array('class'=>'select2 model', 'style'=>'width:100%','id' =>'model_select_id')) }} @@ -418,4 +416,4 @@ $(function () { }); }); -@stop \ No newline at end of file +@stop From 42fe481f71e2536b78501664204138aa9af8e1c6 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 12 Dec 2016 19:06:36 -0800 Subject: [PATCH 9/9] Bumped hash --- config/version.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/version.php b/config/version.php index 7703721e5..8a04a6713 100644 --- a/config/version.php +++ b/config/version.php @@ -1,7 +1,7 @@ 'v3.6.2', - 'build_version' => '10', - 'hash_version' => 'g927a12f', - 'full_hash' => 'v3.6.2-10-g899a991', + 'build_version' => '18', + 'hash_version' => 'g6f1e0d6', + 'full_hash' => 'v3.6.2-18-g6f1e0d6', );