2016-12-14 04:32:10 -08:00
< ? php
use Illuminate\Http\Request ;
/*
|--------------------------------------------------------------------------
| API Routes
|--------------------------------------------------------------------------
|
| Here is where you can register API routes for your application . These
| routes are loaded by the RouteServiceProvider within a group which
| is assigned the " api " middleware group . Enjoy building your API !
|
*/
2021-06-10 13:15:52 -07:00
Route :: group ([ 'prefix' => 'v1' , 'namespace' => 'Api' , 'middleware' => 'auth:api' ], function () {
Route :: get ( '/' , function () {
2020-12-08 21:05:01 -08:00
return response () -> json (
[
'status' => 'error' ,
'message' => '404 endpoint not found. This is the base URL for the API and does not return anything itself. Please check the API reference at https://snipe-it.readme.io/reference to find a valid API endpoint.' ,
'payload' => null ,
], 404 );
});
2018-04-04 17:33:02 -07:00
Route :: group ([ 'prefix' => 'account' ], function () {
Route :: get ( 'requestable/hardware' ,
[
'as' => 'api.assets.requestable' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@requestable' ,
2018-04-04 17:33:02 -07:00
]
);
Route :: get ( 'requests' ,
[
'as' => 'api.assets.requested' ,
2021-06-10 13:15:52 -07:00
'uses' => 'ProfileController@requestedAssets' ,
2018-04-04 17:33:02 -07:00
]
);
});
2017-01-25 21:29:23 -08:00
2021-06-10 13:15:52 -07:00
/*--- Accessories API ---*/
2019-02-19 11:19:00 -08:00
Route :: group ([ 'prefix' => 'accessories' ], function () {
Route :: get ( '{accessory}/checkedout' ,
[
'as' => 'api.accessories.checkedout' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AccessoriesController@checkedout' ,
2019-02-19 11:19:00 -08:00
]
);
Route :: get ( 'selectlist' ,
[
'as' => 'api.accessories.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AccessoriesController@selectlist' ,
2019-02-19 11:19:00 -08:00
]
);
2019-08-14 22:33:56 -07:00
});
// Accessories group
2017-02-23 16:32:35 -08:00
Route :: resource ( 'accessories' , 'AccessoriesController' ,
2021-06-10 13:15:52 -07:00
[ 'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.accessories.index' ,
'show' => 'api.accessories.show' ,
'update' => 'api.accessories.update' ,
'store' => 'api.accessories.store' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.accessories.destroy' ,
2017-01-25 21:29:23 -08:00
],
2017-02-23 16:32:35 -08:00
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'accessory' => 'accessory_id' ],
2017-01-25 21:29:23 -08:00
]
2019-08-14 22:33:56 -07:00
);
2017-01-24 18:58:07 -08:00
2019-08-14 22:33:56 -07:00
// Accessories resource
2017-01-24 18:58:07 -08:00
2017-02-23 16:32:35 -08:00
Route :: group ([ 'prefix' => 'accessories' ], function () {
Route :: get ( '{accessory}/checkedout' ,
[
'as' => 'api.accessories.checkedout' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AccessoriesController@checkedout' ,
2017-02-23 16:32:35 -08:00
]
);
2019-08-02 15:08:26 -07:00
Route :: post ( '{accessory}/checkout' ,
[
'as' => 'api.accessories.checkout' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AccessoriesController@checkout' ,
2019-08-02 15:08:26 -07:00
]
);
Route :: post ( '{accessory}/checkin' ,
[
'as' => 'api.accessories.checkin' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AccessoriesController@checkin' ,
2019-08-02 15:08:26 -07:00
]
);
2017-02-23 16:32:35 -08:00
}); // Accessories group
2017-01-26 21:02:59 -08:00
2017-02-23 16:32:35 -08:00
/*--- Categories API ---*/
2017-01-13 04:50:20 -08:00
2017-10-26 22:09:08 -07:00
Route :: group ([ 'prefix' => 'categories' ], function () {
2017-10-28 11:17:52 -07:00
Route :: get ( '{item_type}/selectlist' ,
2017-10-26 22:09:08 -07:00
[
'as' => 'api.categories.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'CategoriesController@selectlist' ,
2017-10-26 22:09:08 -07:00
]
);
2019-08-14 22:33:56 -07:00
});
2017-10-26 22:09:08 -07:00
2019-08-14 22:33:56 -07:00
// Categories group
2017-01-13 09:01:10 -08:00
Route :: resource ( 'categories' , 'CategoriesController' ,
2017-02-23 16:32:35 -08:00
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.categories.index' ,
'show' => 'api.categories.show' ,
'store' => 'api.categories.store' ,
'update' => 'api.categories.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.categories.destroy' ,
2017-02-23 16:32:35 -08:00
],
2017-01-13 09:01:10 -08:00
'except' => [ 'edit' , 'create' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'category' => 'category_id' ],
2017-01-13 09:01:10 -08:00
]
2017-02-23 16:32:35 -08:00
); // Categories resource
/*--- Companies API ---*/
2017-01-13 04:50:20 -08:00
2021-06-10 13:15:52 -07:00
Route :: get ( 'companies/selectlist' , [
2017-10-26 16:37:41 -07:00
'as' => 'companies.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'CompaniesController@selectlist' ,
2017-10-26 16:37:41 -07:00
]);
2019-08-14 22:33:56 -07:00
// Companies resource
2017-01-12 23:41:08 -08:00
Route :: resource ( 'companies' , 'CompaniesController' ,
2017-02-23 16:32:35 -08:00
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.companies.index' ,
'show' => 'api.companies.show' ,
'store' => 'api.companies.store' ,
'update' => 'api.companies.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.companies.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'component' => 'component_id' ],
2017-01-12 23:41:08 -08:00
]
2017-02-23 16:32:35 -08:00
); // Companies resource
2017-01-12 19:41:01 -08:00
2017-05-22 21:31:47 -07:00
/*--- Departments API ---*/
2017-10-28 09:21:39 -07:00
Route :: group ([ 'prefix' => 'departments' ], function () {
Route :: get ( 'selectlist' ,
[
'as' => 'api.departments.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'DepartmentsController@selectlist' ,
2017-10-28 09:21:39 -07:00
]
);
}); // Departments group
2017-05-22 21:31:47 -07:00
Route :: resource ( 'departments' , 'DepartmentsController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-05-22 21:31:47 -07:00
'index' => 'api.departments.index' ,
'show' => 'api.departments.show' ,
'store' => 'api.departments.store' ,
'update' => 'api.departments.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.departments.destroy' ,
2017-05-22 21:31:47 -07:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'department' => 'department_id' ],
2017-05-22 21:31:47 -07:00
]
); // Departments resource
2017-02-23 16:32:35 -08:00
/*--- Components API ---*/
2017-01-12 19:41:01 -08:00
2017-01-12 23:41:08 -08:00
Route :: resource ( 'components' , 'ComponentsController' ,
2017-02-23 16:32:35 -08:00
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.components.index' ,
'show' => 'api.components.show' ,
'store' => 'api.components.store' ,
'update' => 'api.components.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.components.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'component' => 'component_id' ],
2017-01-12 19:41:01 -08:00
]
2017-02-23 16:32:35 -08:00
); // Components resource
2017-01-12 19:41:01 -08:00
2017-02-23 16:32:35 -08:00
Route :: group ([ 'prefix' => 'components' ], function () {
Route :: get ( '{component}/assets' ,
2017-01-12 19:41:01 -08:00
[
2017-02-23 16:32:35 -08:00
'as' => 'api.components.assets' ,
'uses' => 'ComponentsController@getAssets' ,
]
);
}); // Components group
2017-01-12 19:41:01 -08:00
2017-02-23 16:32:35 -08:00
/*--- Consumables API ---*/
2019-02-19 11:19:00 -08:00
Route :: get ( 'consumables/selectlist' ,
[
'as' => 'api.consumables.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'ConsumablesController@selectlist' ,
2019-02-19 11:19:00 -08:00
]
);
2017-02-23 16:32:35 -08:00
Route :: resource ( 'consumables' , 'ConsumablesController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.consumables.index' ,
'show' => 'api.consumables.show' ,
'store' => 'api.consumables.store' ,
'update' => 'api.consumables.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.consumables.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'consumable' => 'consumable_id' ],
2017-02-01 18:50:28 -08:00
]
2017-02-23 16:32:35 -08:00
); // Consumables resource
2019-08-14 22:33:56 -07:00
Squashed commit of the following:
commit e321aeabaed580f8de6ee309b377654620f117be
Merge: 8ec99ff43 37568ae9e
Author: snipe <snipe@snipe.net>
Date: Mon Aug 31 12:14:44 2020 -0700
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
commit 37568ae9ec021789d910de91bdef5f64e517451a
Merge: 01a832169 32ad9050c
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:49:37 2020 -0700
Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cff8a9bfc89e5a832a9bbf1ad03dadd3
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:48:53 2020 -0700
Added google maps to CSP
commit 01a832169c7572960340e743e569fe9ffdc3f996
Merge: bcad49ce7 3c6883489
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:38:31 2020 -0700
Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489c030df8d90e2f18cab3ad96121205e5
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:37:30 2020 -0700
Added assignedTo scope
commit bcad49ce79ad7aab99bec8b273a78bb531c48ef0
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:10:22 2020 -0700
Try to better handle slack “too many requests” issue
commit b5acca89d72a43f42fb81a4bf06e8b7c3da0b93b
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:02:15 2020 -0700
Check for admin for slack notifications
commit e52919cf1b17871c6bf294cfb1a9be59f6033289
Merge: 714576be4 29f3a5c48
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:35:15 2020 -0700
Merge pull request #8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f9b9fc4fcfb19cc6eebb1ce1e0e5a91
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:27:40 2020 -0700
Use more verbose annotation for Auth::user if/else
commit 134e8e6fb9958e71b8fa960de53c041324bd9e1c
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:25:07 2020 -0700
Moved user email nulling until after the save
commit 714576be45dabe9a2b23d3090ec0c72ab8ec28da
Merge: b999c50a2 512899294
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Aug 14 15:24:03 2020 -0700
Merge pull request #8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 5128992940b8565e5e87a2a917d3bcde8e21b711
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Fri Aug 14 15:03:03 2020 -0700
Fix deprecation report for customers with many active assets
commit 02913235020d242e959f274fec588d9ebf8e39fa
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:57:58 2020 -0700
Use the user as the target
commit e0f6f9b83972ef9fde79dbc342555580a0574591
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:37 2020 -0700
Artisan command to check in licenses from all users
commit f1a6308002caa865fe1a9b17b91d34fbfdd94a75
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:07 2020 -0700
Check for Auth::user before trying to log id (for cli)
commit b999c50a2eef14bdf44be8e4359f794194170d2d
Merge: 9ca20e496 e3906b245
Author: snipe <snipe@snipe.net>
Date: Wed Aug 12 12:37:47 2020 -0700
Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9b85eca723bffa88b9af28f290e0fe
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Aug 12 12:27:18 2020 -0700
added translation for admin/licenses/message.not_found
commit 9ca20e4964e57621af8f6b2e790e0d68b69b1afb
Merge: e0644dbbf 456a74d88
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Aug 11 17:33:19 2020 -0700
Merge pull request #8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c1b1f14828aaf63e5122eb8b6831755
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:41:20 2020 -0700
De-merge out incorrectly merged files. Whoops!
commit 799c059070eff849c81550423d16344748522bc7
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:21:18 2020 -0700
Add internationalized version of LDAP error message
commit c62d43a77831dd798054b95e7ad9e72210f6accf
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:04:17 2020 -0700
Improve Exception management in Artisan LDAP Sync method. Still need to localize this better
commit b725bd0fae2b062d81a460283aa07b2186a99197
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:23:04 2020 -0700
Add @PeterUpfold as a contributor
commit e0644dbbf6b5601b6712ca16877b481799e9652c
Merge: 5b6925b00 004ecad05
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Mon Aug 10 17:22:31 2020 -0700
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00c04b1abdea0235d04dda32c89215201
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 21:00:37 2020 -0700
Removed debugging :(
commit df17a859bfab8876d3e849c42692e01bdfdbd886
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:59:54 2020 -0700
Changed modal IDs so manager creation modal works on user creation main page
commit 24c43056ba9e738334eb2310db7c9920d9ab0613
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:58:28 2020 -0700
Moved pGenerator script to default layout footer
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
commit 606b7e905df1918336cef64984e54207ca6a7644
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 17:02:33 2020 -0700
Small edits to PR template
Slight text changes to ask specifics about versions
commit d73ddad477cb9c675f15fbd54bdb1486bf8f14fc
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 16:59:26 2020 -0700
Created a PR template
First draft of the PR guidelines template
commit 9a39cf721e82aa25623e41eeb280d7bed3b3c178
Merge: 7410b1683 8994f3e15
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 12:18:49 2020 -0700
Merge pull request #8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835bab1563bf2b7baaddb55377083a3a0
Merge: e955c983a b09e7d19b
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Jul 24 16:22:44 2020 -0700
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15e9fef5d1ec9c44764b424fa7edf9448
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 19:57:06 2020 -0400
cleanup
commit d23f1a77cac396a3a4962c5993cf1bdbfcf52a29
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 18:46:02 2020 -0400
implement checkout API
commit e955c983a3a9bd7793cf9a5f63b6e2c56d53d63f
Merge: 2fa17ac18 eed41e454
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 13:43:29 2020 -0700
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b3bc424d5960de9f5ffd272b2f19c272
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Wed Jul 22 13:32:16 2020 -0700
Add new useraccountcontrol value for valid AD users; document algorithm and values
commit 2fa17ac18557969f5627953f6d041610207656a6
Merge: b90515437 3b1e46f72
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 12:06:31 2020 -0700
Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b81bd27e5ba0783c88f9d0d0038d611
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:25:57 2020 -0700
Update general.php
commit 0c1a1de2a21dfd3639e3d2d2df995c3452c15a11
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:24:36 2020 -0700
Update general.php
fixed typo
commit 20c9ae5818ae22846bf2149f261e7f70cc8a7c71
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 22 10:21:19 2020 -0700
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats
commit eed41e454962bb6e9e6cbcf79cb4aed292ac2bbf
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:57:32 2020 -0700
Moved address down further, fixed broken HTML
commit b750f4754f5f4245c0f490f6b6832b4c10615f27
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:54 2020 -0700
Added city to bulk user importer
commit c17a06792a76ee11215bd576f2df9732416b3e9d
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:38 2020 -0700
Added address, city, state, country to user importer
commit 4f76cc6cfbad1eeded1981e8569e915ca37b87d9
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:46:13 2020 -0700
I don’t actually know what this file is for
commit b905154373bcf0b1ef64d57bb95f184557caba37
Author: snipe <snipe@snipe.net>
Date: Mon Jul 20 14:29:32 2020 -0700
Fixed #8247 - added notes field to user details display
commit daf748e531324215bfd746b406407fee7476d0ab
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:32:01 2020 -0700
Bumped hash
commit 799a93c46a198a8235bbce1527ea7bf4929129c2
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:11:32 2020 -0700
Allow for email/username search on users
commit 34aa12e229fef497b355a492b5ef2c003337786b
Merge: 81a633288 897757bd0
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:44:13 2020 -0700
Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd0461cefd2e82aba344d416ed6843c49c
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:43:44 2020 -0700
Removed added line for location
commit c7125c39375b101f852930536dabcc079f2d5e88
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 16:34:39 2020 -0700
Set location_id to rtd_location_id on asset creation
commit 81a6332889e9e4684ee65a669bc2b3bc1a3ced50
Author: snipe <snipe@snipe.net>
Date: Tue Jul 14 13:55:38 2020 -0700
Removed license ID from seats table cookie info
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
commit 6e563f6e4bfd9f8b52c8c8d39a60b466e64ba654
Merge: 5320f5c67 7f69ae953
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:54 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 5320f5c67ce7dbf4605cc5b7fd7be8773c8ee157
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:45 2020 -0700
Disallow non-super users from editing their own permissions
commit 7f69ae953b7990107bd0db3de16621e5238136e9
Merge: c79f8c1ba 17f6fbabf
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:00 2020 -0700
Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfaa15f203a6accecf6a7b83c35d56ef8
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 21:12:03 2020 -0700
Switch to 'items' to maintain compatbility with other internal API's
commit c79f8c1baf920f41d43827094691275eec529448
Merge: 12c92e30b 536401fe0
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 17:42:16 2020 -0700
Merge pull request #8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c91c14280f96e0e58f9921f73cf88c43
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 17:14:31 2020 -0700
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 12c92e30b7a20ecd0e45b5a052b43c81dd35cc97
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 16:21:27 2020 -0700
Show whether or not the user was imported via LDAP in the view page
commit fd10b755b0241e354a265454c13965228a265a85
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 11:30:01 2020 -0700
Removed the sr-only tag in table headers
It was breaking Bootstrap Tables column selector :(
commit dbbb7680d9d92ab42ffcca825fd93ff6cc3e5f89
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 21:12:50 2020 -0700
A few more fixes for the cli
Do not check out a piece of software if it’s already been checked out to the user
commit cf0dd5bbadef3689dd9110d96e7d060ddb5fc827
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:43:13 2020 -0700
Small fixes for cli tool
commit 25e53d8c7f4ba1d5977bb5fbc5265ac9c8c543d9
Merge: ec6ed256f 89d433b41
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:27:01 2020 -0700
Merge pull request #8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41aa0de862cb60142c8d6ef80f339a958
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:26:02 2020 -0700
Removed duplicate seat call
commit e2570ada6f158dfc9acead583a0b2fa7fae17ca6
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:04:05 2020 -0700
CLI tool to checkout a license to ALL users
commit 45afe725a1f039dddd87537e16470963684f0711
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:03:47 2020 -0700
Only try to get the company if there is an auth’d user
(Needed for command line tools, where no Auth::user() is present)
commit 536401fe0ff97cd6a8077cef993bfe755ed46851
Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com>
Date: Tue Jul 7 08:21:36 2020 +0200
Update snipeit.sh
Ubuntu 20.04
commit ec6ed256fbc7740f76ee22867b6fe2008ff7873e
Author: snipe <snipe@snipe.net>
Date: Mon Jul 6 18:45:43 2020 -0700
Bumped minor version
commit 2aaa7bed2d4fad6e8f7b101ecdae1f46ab8a00c2
Merge: 339bdddc3 cc9f1577a
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 18:37:41 2020 -0700
Merge pull request #8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a47708a6e11dffeab4797982be243cfa
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:43:53 2020 -0700
Removed unused use directives
commit ab1fe8be0c72522273c468dfd5551553d9f92665
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:42:39 2020 -0700
Added merge utility
commit 339bdddc384aa655fa186dc36e02cc587487d4af
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 11:00:33 2020 -0700
Fix for Vue js not loading due to CSP :(
commit 35b9cf4b703b9ced785daec1d35973ca266cdc49
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 02:41:59 2020 -0700
Fixed missing db prefix on scopeDueOrOverdueForAudit
commit 7ccb41371e0efc46d51abc790f49a9fb73e9b8bc
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:09:39 2020 -0700
Removed unoptimized images directive
securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯
commit 2e60a457bf45640a0563a2bc4b66e02b0d226271
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:07:00 2020 -0700
Dumb fix for feature-policy being dumb.
commit 2390d2160bff7b4b340696fa527b1bc871bddff1
Merge: b42801f6a 00b051b8c
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:27:47 2020 -0700
Merge pull request #8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c7f1af5218a11f2b33fcab37934bd894
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:26:09 2020 -0700
Added a few more comments
commit 05b3a9ad7e72cc71b09ed8ef2e87db19fa3700ee
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 23:17:27 2020 -0700
Config variable for HSTS
commit 4fb880384fd455bd59a3b91c4244c392d7198c48
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:37:14 2020 -0700
Changed comment
commit 43042ad8412d8d89a9b09e47e5da8b276c9655f2
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:35:59 2020 -0700
Consolidated ReferrerPolicy into new SecurityHeaders file
commit a716382ac43d0a58b96604a3ec15e389b7ae97c2
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:33:37 2020 -0700
Removed CSP middleware (it’s added in the general header)
commit 36c8f7f4f116666c63ae7bc0d12e15f77a8fd6bc
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:31:01 2020 -0700
Additional security headers
commit b42801f6ae635e843d9e062b4119d86fb3d05fc6
Merge: de4934f21 946129f20
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:47:35 2020 -0700
Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f20614e65bbbecbbda70cfba81b89d0937
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:45:20 2020 -0700
Made quote style consistent
commit b941ef1e08f84f40f503db6ebe67d0e8dca9c74a
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:41:40 2020 -0700
Pulled CSS font awesome styles out of the blade and into overrides.css
commit d1aa11ec89347fb2c139d751719c4459c2448321
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:29:19 2020 -0700
Fix for weird padlock display in asset listing with encrypted custom fields
commit de4934f21d34a628e57992fc6a59813f42c55d90
Merge: af06e4205 b10076b01
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 17:28:38 2020 -0700
Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015ac0034fded62548135aaff3f1b2a0a
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Jun 22 17:04:39 2020 -0700
corrected an error where font-size for labels were static in settings.
commit af06e4205627b29f583b2e2e770fd2913fce5e46
Author: snipe <snipe@snipe.net>
Date: Wed Jun 17 11:17:25 2020 -0700
Bumped version
commit 9a2440dc4b98a9c12b38a04504875c7c196a510c
Merge: beae8efb2 2ac1c1636
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 20:20:07 2020 -0700
Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c672db59d601bd5c73d4a8023533ec9
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 16:12:57 2020 -0700
Better handle the logic to determine if we should display the license checkout blade
commit 004ecad059d636cc5be62aa5f112e3c4f9762326
Author: Peter Upfold <pgithub@upfold.org.uk>
Date: Wed Jun 3 08:59:50 2020 +0100
Force suppress deprecation warning on ldap_control_paged_result()
commit beae8efb21c2675b3da4308a87d911c534e70361
Merge: d14ab7e3e 9839e5e56
Author: snipe <snipe@snipe.net>
Date: Wed May 27 23:01:33 2020 -0700
Merge pull request #8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566f51f85abe6860dfc8377042834c89b
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed May 27 12:27:40 2020 -0700
adjusted for all label text, removed local variable
commit d14ab7e3e1bf09c931ad148fdb6b65ee5a3dc7b8
Author: snipe <snipe@snipe.net>
Date: Wed May 27 00:22:44 2020 -0700
Porting change from #8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c179730f8b8502da5e2c1c90fa8ec594
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:22:45 2020 -0700
Label_Woes
commit e97cf011b65df9e66826c26464fed7bf4001917a
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:15:39 2020 -0700
Label_Woes
commit ed23505054cd1bdf2ef695b6b010e025382f38da
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:10:45 2020 -0700
Label_Woes
commit 001e721530c41fd8ad8e925cecdef2eb8c96ab4c
Merge: f88683766 8210da6e8
Author: snipe <snipe@snipe.net>
Date: Wed May 20 10:21:52 2020 -0700
Merge pull request #8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82018afab07197abe591a7666a56af21
Author: Daniel Meltzer <dmeltzer.devel@gmail.com>
Date: Wed May 20 10:29:27 2020 -0400
Fix Missing Category selection in Asset Model Modal dialog.
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
commit f88683766b1c7e9636aebe2fc952e6f036d3882c
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:55:47 2020 -0700
Roll back previous change
Signed-off-by: snipe <snipe@snipe.net>
commit e4385c0f8c584061670a1f98b13bbe90a124ac05
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:48:30 2020 -0700
Fixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa4e5569bd7ca28354ca282ca2ef2825
Author: snipe <snipe@snipe.net>
Date: Tue May 12 10:31:54 2020 -0700
Fix for session fixation vulnerability
Signed-off-by: snipe <snipe@snipe.net>
commit 7fb3a9b82c09b3aab65bf2b00f76efc66356155e
Merge: 9a2ed804c ecb1e87fe
Author: snipe <snipe@snipe.net>
Date: Mon May 11 22:41:36 2020 -0700
Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6e7ab67900936a0f158670cc4c21c56
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:45:15 2020 -0700
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
commit f43df5f04147ded31cc625ef92f87127993e94b3
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:44:46 2020 -0700
Fixed form label
Signed-off-by: snipe <snipe@snipe.net>
commit 95cc48e422e54b373d3a88d20d15d7536a323dce
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:41:10 2020 -0700
Added option to disable backup in import
Signed-off-by: snipe <snipe@snipe.net>
commit 9a2ed804ca9f71a9705da604a2c721ceeb9a5567
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:42 2020 -0700
Fixed mismatched HTML header tags
Signed-off-by: snipe <snipe@snipe.net>
commit d20fad28e5e807c7577d9bd0e5146e5607affa33
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:24 2020 -0700
Use more modern request helper
Signed-off-by: snipe <snipe@snipe.net>
commit ae813ddf75b21c45420016033c667ee35a9fc52b
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:11:16 2020 -0700
Add @alek13 as a contributor
commit bb42109c0c76b6709f39190ae4a1daa55865d306
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:10:45 2020 -0700
Added a clarifying comment
Signed-off-by: snipe <snipe@snipe.net>
commit f46ecf8ec0c1723e2e04036357c74644c30d4cb7
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:20 2020 -0700
Updated composer lock
Signed-off-by: snipe <snipe@snipe.net>
commit b9e821c0e65e0745064b42aa6cccf9627c5df3e6
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:14 2020 -0700
Small fix for Group Functional Tests
Signed-off-by: snipe <snipe@snipe.net>
commit 9ee28c7513616018f8ff0b8f5b167469e19070eb
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:02 2020 -0700
Switched to use info instead of danger on undeployable statuses
Signed-off-by: snipe <snipe@snipe.net>
commit 1a8ba06702727b1de870d05df53443270b35b8b7
Merge: 0fd232e70 ee4d69b1c
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:32 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 0fd232e70d2be9ce845a73745ac98800bcfef9e2
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:24 2020 -0700
Fixed group functional test
(We had changed the minimum to 2 instead of 3)
Signed-off-by: snipe <snipe@snipe.net>
commit ee4d69b1c59c6baf832574da9e9bbbe67248a4bc
Merge: 31c535094 d1ad11194
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:52:45 2020 -0700
Merge pull request #8041 from alek13/patch-1
use supported package for slack
commit d1ad11194936c51050d2e7a77d01c0daa1dde4fd
Author: Alexander Chibrikin <alek13.me@gmail.com>
Date: Mon May 11 20:31:13 2020 +0300
use supported package for slack
see https://github.com/maknz/slack/issues/94
commit 31c5350941c7330aed01652b0670b61f6660b15b
Author: snipe <snipe@snipe.net>
Date: Fri May 1 01:05:48 2020 -0700
Fixed incorrect route for groups edit
Signed-off-by: snipe <snipe@snipe.net>
commit 7eb70e17e0b4d0f1ed1fe3ed7fbff1728eb077fb
Merge: 5bb4f271a 3dfcb4699
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:50:37 2020 -0700
Merge pull request #7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb469910456b3213e00c5cd2f839d25dbf2c7
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:41:08 2020 -0700
Minor formatting changes
Signed-off-by: snipe <snipe@snipe.net>
commit 96eb96f964c40b798d5ceed25eff2bbef4f0bc51
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:27:00 2020 -0700
Removed stray val (typo)
Signed-off-by: snipe <snipe@snipe.net>
commit a2f08bd3baa6fb23633ceb58e5408b125b0f0029
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:08:54 2020 -0700
Added comments
Signed-off-by: snipe <snipe@snipe.net>
commit e009fbe59f39a717a4ad7bea5027d39cb5323225
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:04:53 2020 -0700
Converted table heading icons in People to CSS glyphs
Signed-off-by: snipe <snipe@snipe.net>
commit 5bb4f271aaa42a0c211d25e06a500a76c5a224f4
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 00:47:19 2020 -0700
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
Route :: group ([ 'prefix' => 'consumables' ], function () {
Route :: get ( 'view/{id}/users' ,
[
'as' => 'api.consumables.showUsers' ,
2021-06-10 13:15:52 -07:00
'uses' => 'ConsumablesController@getDataView' ,
Squashed commit of the following:
commit e321aeabaed580f8de6ee309b377654620f117be
Merge: 8ec99ff43 37568ae9e
Author: snipe <snipe@snipe.net>
Date: Mon Aug 31 12:14:44 2020 -0700
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
commit 37568ae9ec021789d910de91bdef5f64e517451a
Merge: 01a832169 32ad9050c
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:49:37 2020 -0700
Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cff8a9bfc89e5a832a9bbf1ad03dadd3
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:48:53 2020 -0700
Added google maps to CSP
commit 01a832169c7572960340e743e569fe9ffdc3f996
Merge: bcad49ce7 3c6883489
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:38:31 2020 -0700
Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489c030df8d90e2f18cab3ad96121205e5
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:37:30 2020 -0700
Added assignedTo scope
commit bcad49ce79ad7aab99bec8b273a78bb531c48ef0
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:10:22 2020 -0700
Try to better handle slack “too many requests” issue
commit b5acca89d72a43f42fb81a4bf06e8b7c3da0b93b
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:02:15 2020 -0700
Check for admin for slack notifications
commit e52919cf1b17871c6bf294cfb1a9be59f6033289
Merge: 714576be4 29f3a5c48
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:35:15 2020 -0700
Merge pull request #8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f9b9fc4fcfb19cc6eebb1ce1e0e5a91
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:27:40 2020 -0700
Use more verbose annotation for Auth::user if/else
commit 134e8e6fb9958e71b8fa960de53c041324bd9e1c
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:25:07 2020 -0700
Moved user email nulling until after the save
commit 714576be45dabe9a2b23d3090ec0c72ab8ec28da
Merge: b999c50a2 512899294
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Aug 14 15:24:03 2020 -0700
Merge pull request #8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 5128992940b8565e5e87a2a917d3bcde8e21b711
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Fri Aug 14 15:03:03 2020 -0700
Fix deprecation report for customers with many active assets
commit 02913235020d242e959f274fec588d9ebf8e39fa
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:57:58 2020 -0700
Use the user as the target
commit e0f6f9b83972ef9fde79dbc342555580a0574591
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:37 2020 -0700
Artisan command to check in licenses from all users
commit f1a6308002caa865fe1a9b17b91d34fbfdd94a75
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:07 2020 -0700
Check for Auth::user before trying to log id (for cli)
commit b999c50a2eef14bdf44be8e4359f794194170d2d
Merge: 9ca20e496 e3906b245
Author: snipe <snipe@snipe.net>
Date: Wed Aug 12 12:37:47 2020 -0700
Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9b85eca723bffa88b9af28f290e0fe
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Aug 12 12:27:18 2020 -0700
added translation for admin/licenses/message.not_found
commit 9ca20e4964e57621af8f6b2e790e0d68b69b1afb
Merge: e0644dbbf 456a74d88
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Aug 11 17:33:19 2020 -0700
Merge pull request #8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c1b1f14828aaf63e5122eb8b6831755
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:41:20 2020 -0700
De-merge out incorrectly merged files. Whoops!
commit 799c059070eff849c81550423d16344748522bc7
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:21:18 2020 -0700
Add internationalized version of LDAP error message
commit c62d43a77831dd798054b95e7ad9e72210f6accf
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:04:17 2020 -0700
Improve Exception management in Artisan LDAP Sync method. Still need to localize this better
commit b725bd0fae2b062d81a460283aa07b2186a99197
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:23:04 2020 -0700
Add @PeterUpfold as a contributor
commit e0644dbbf6b5601b6712ca16877b481799e9652c
Merge: 5b6925b00 004ecad05
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Mon Aug 10 17:22:31 2020 -0700
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00c04b1abdea0235d04dda32c89215201
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 21:00:37 2020 -0700
Removed debugging :(
commit df17a859bfab8876d3e849c42692e01bdfdbd886
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:59:54 2020 -0700
Changed modal IDs so manager creation modal works on user creation main page
commit 24c43056ba9e738334eb2310db7c9920d9ab0613
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:58:28 2020 -0700
Moved pGenerator script to default layout footer
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
commit 606b7e905df1918336cef64984e54207ca6a7644
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 17:02:33 2020 -0700
Small edits to PR template
Slight text changes to ask specifics about versions
commit d73ddad477cb9c675f15fbd54bdb1486bf8f14fc
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 16:59:26 2020 -0700
Created a PR template
First draft of the PR guidelines template
commit 9a39cf721e82aa25623e41eeb280d7bed3b3c178
Merge: 7410b1683 8994f3e15
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 12:18:49 2020 -0700
Merge pull request #8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835bab1563bf2b7baaddb55377083a3a0
Merge: e955c983a b09e7d19b
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Jul 24 16:22:44 2020 -0700
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15e9fef5d1ec9c44764b424fa7edf9448
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 19:57:06 2020 -0400
cleanup
commit d23f1a77cac396a3a4962c5993cf1bdbfcf52a29
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 18:46:02 2020 -0400
implement checkout API
commit e955c983a3a9bd7793cf9a5f63b6e2c56d53d63f
Merge: 2fa17ac18 eed41e454
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 13:43:29 2020 -0700
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b3bc424d5960de9f5ffd272b2f19c272
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Wed Jul 22 13:32:16 2020 -0700
Add new useraccountcontrol value for valid AD users; document algorithm and values
commit 2fa17ac18557969f5627953f6d041610207656a6
Merge: b90515437 3b1e46f72
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 12:06:31 2020 -0700
Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b81bd27e5ba0783c88f9d0d0038d611
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:25:57 2020 -0700
Update general.php
commit 0c1a1de2a21dfd3639e3d2d2df995c3452c15a11
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:24:36 2020 -0700
Update general.php
fixed typo
commit 20c9ae5818ae22846bf2149f261e7f70cc8a7c71
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 22 10:21:19 2020 -0700
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats
commit eed41e454962bb6e9e6cbcf79cb4aed292ac2bbf
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:57:32 2020 -0700
Moved address down further, fixed broken HTML
commit b750f4754f5f4245c0f490f6b6832b4c10615f27
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:54 2020 -0700
Added city to bulk user importer
commit c17a06792a76ee11215bd576f2df9732416b3e9d
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:38 2020 -0700
Added address, city, state, country to user importer
commit 4f76cc6cfbad1eeded1981e8569e915ca37b87d9
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:46:13 2020 -0700
I don’t actually know what this file is for
commit b905154373bcf0b1ef64d57bb95f184557caba37
Author: snipe <snipe@snipe.net>
Date: Mon Jul 20 14:29:32 2020 -0700
Fixed #8247 - added notes field to user details display
commit daf748e531324215bfd746b406407fee7476d0ab
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:32:01 2020 -0700
Bumped hash
commit 799a93c46a198a8235bbce1527ea7bf4929129c2
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:11:32 2020 -0700
Allow for email/username search on users
commit 34aa12e229fef497b355a492b5ef2c003337786b
Merge: 81a633288 897757bd0
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:44:13 2020 -0700
Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd0461cefd2e82aba344d416ed6843c49c
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:43:44 2020 -0700
Removed added line for location
commit c7125c39375b101f852930536dabcc079f2d5e88
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 16:34:39 2020 -0700
Set location_id to rtd_location_id on asset creation
commit 81a6332889e9e4684ee65a669bc2b3bc1a3ced50
Author: snipe <snipe@snipe.net>
Date: Tue Jul 14 13:55:38 2020 -0700
Removed license ID from seats table cookie info
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
commit 6e563f6e4bfd9f8b52c8c8d39a60b466e64ba654
Merge: 5320f5c67 7f69ae953
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:54 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 5320f5c67ce7dbf4605cc5b7fd7be8773c8ee157
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:45 2020 -0700
Disallow non-super users from editing their own permissions
commit 7f69ae953b7990107bd0db3de16621e5238136e9
Merge: c79f8c1ba 17f6fbabf
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:00 2020 -0700
Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfaa15f203a6accecf6a7b83c35d56ef8
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 21:12:03 2020 -0700
Switch to 'items' to maintain compatbility with other internal API's
commit c79f8c1baf920f41d43827094691275eec529448
Merge: 12c92e30b 536401fe0
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 17:42:16 2020 -0700
Merge pull request #8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c91c14280f96e0e58f9921f73cf88c43
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 17:14:31 2020 -0700
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 12c92e30b7a20ecd0e45b5a052b43c81dd35cc97
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 16:21:27 2020 -0700
Show whether or not the user was imported via LDAP in the view page
commit fd10b755b0241e354a265454c13965228a265a85
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 11:30:01 2020 -0700
Removed the sr-only tag in table headers
It was breaking Bootstrap Tables column selector :(
commit dbbb7680d9d92ab42ffcca825fd93ff6cc3e5f89
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 21:12:50 2020 -0700
A few more fixes for the cli
Do not check out a piece of software if it’s already been checked out to the user
commit cf0dd5bbadef3689dd9110d96e7d060ddb5fc827
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:43:13 2020 -0700
Small fixes for cli tool
commit 25e53d8c7f4ba1d5977bb5fbc5265ac9c8c543d9
Merge: ec6ed256f 89d433b41
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:27:01 2020 -0700
Merge pull request #8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41aa0de862cb60142c8d6ef80f339a958
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:26:02 2020 -0700
Removed duplicate seat call
commit e2570ada6f158dfc9acead583a0b2fa7fae17ca6
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:04:05 2020 -0700
CLI tool to checkout a license to ALL users
commit 45afe725a1f039dddd87537e16470963684f0711
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:03:47 2020 -0700
Only try to get the company if there is an auth’d user
(Needed for command line tools, where no Auth::user() is present)
commit 536401fe0ff97cd6a8077cef993bfe755ed46851
Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com>
Date: Tue Jul 7 08:21:36 2020 +0200
Update snipeit.sh
Ubuntu 20.04
commit ec6ed256fbc7740f76ee22867b6fe2008ff7873e
Author: snipe <snipe@snipe.net>
Date: Mon Jul 6 18:45:43 2020 -0700
Bumped minor version
commit 2aaa7bed2d4fad6e8f7b101ecdae1f46ab8a00c2
Merge: 339bdddc3 cc9f1577a
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 18:37:41 2020 -0700
Merge pull request #8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a47708a6e11dffeab4797982be243cfa
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:43:53 2020 -0700
Removed unused use directives
commit ab1fe8be0c72522273c468dfd5551553d9f92665
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:42:39 2020 -0700
Added merge utility
commit 339bdddc384aa655fa186dc36e02cc587487d4af
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 11:00:33 2020 -0700
Fix for Vue js not loading due to CSP :(
commit 35b9cf4b703b9ced785daec1d35973ca266cdc49
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 02:41:59 2020 -0700
Fixed missing db prefix on scopeDueOrOverdueForAudit
commit 7ccb41371e0efc46d51abc790f49a9fb73e9b8bc
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:09:39 2020 -0700
Removed unoptimized images directive
securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯
commit 2e60a457bf45640a0563a2bc4b66e02b0d226271
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:07:00 2020 -0700
Dumb fix for feature-policy being dumb.
commit 2390d2160bff7b4b340696fa527b1bc871bddff1
Merge: b42801f6a 00b051b8c
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:27:47 2020 -0700
Merge pull request #8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c7f1af5218a11f2b33fcab37934bd894
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:26:09 2020 -0700
Added a few more comments
commit 05b3a9ad7e72cc71b09ed8ef2e87db19fa3700ee
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 23:17:27 2020 -0700
Config variable for HSTS
commit 4fb880384fd455bd59a3b91c4244c392d7198c48
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:37:14 2020 -0700
Changed comment
commit 43042ad8412d8d89a9b09e47e5da8b276c9655f2
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:35:59 2020 -0700
Consolidated ReferrerPolicy into new SecurityHeaders file
commit a716382ac43d0a58b96604a3ec15e389b7ae97c2
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:33:37 2020 -0700
Removed CSP middleware (it’s added in the general header)
commit 36c8f7f4f116666c63ae7bc0d12e15f77a8fd6bc
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:31:01 2020 -0700
Additional security headers
commit b42801f6ae635e843d9e062b4119d86fb3d05fc6
Merge: de4934f21 946129f20
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:47:35 2020 -0700
Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f20614e65bbbecbbda70cfba81b89d0937
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:45:20 2020 -0700
Made quote style consistent
commit b941ef1e08f84f40f503db6ebe67d0e8dca9c74a
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:41:40 2020 -0700
Pulled CSS font awesome styles out of the blade and into overrides.css
commit d1aa11ec89347fb2c139d751719c4459c2448321
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:29:19 2020 -0700
Fix for weird padlock display in asset listing with encrypted custom fields
commit de4934f21d34a628e57992fc6a59813f42c55d90
Merge: af06e4205 b10076b01
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 17:28:38 2020 -0700
Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015ac0034fded62548135aaff3f1b2a0a
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Jun 22 17:04:39 2020 -0700
corrected an error where font-size for labels were static in settings.
commit af06e4205627b29f583b2e2e770fd2913fce5e46
Author: snipe <snipe@snipe.net>
Date: Wed Jun 17 11:17:25 2020 -0700
Bumped version
commit 9a2440dc4b98a9c12b38a04504875c7c196a510c
Merge: beae8efb2 2ac1c1636
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 20:20:07 2020 -0700
Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c672db59d601bd5c73d4a8023533ec9
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 16:12:57 2020 -0700
Better handle the logic to determine if we should display the license checkout blade
commit 004ecad059d636cc5be62aa5f112e3c4f9762326
Author: Peter Upfold <pgithub@upfold.org.uk>
Date: Wed Jun 3 08:59:50 2020 +0100
Force suppress deprecation warning on ldap_control_paged_result()
commit beae8efb21c2675b3da4308a87d911c534e70361
Merge: d14ab7e3e 9839e5e56
Author: snipe <snipe@snipe.net>
Date: Wed May 27 23:01:33 2020 -0700
Merge pull request #8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566f51f85abe6860dfc8377042834c89b
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed May 27 12:27:40 2020 -0700
adjusted for all label text, removed local variable
commit d14ab7e3e1bf09c931ad148fdb6b65ee5a3dc7b8
Author: snipe <snipe@snipe.net>
Date: Wed May 27 00:22:44 2020 -0700
Porting change from #8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c179730f8b8502da5e2c1c90fa8ec594
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:22:45 2020 -0700
Label_Woes
commit e97cf011b65df9e66826c26464fed7bf4001917a
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:15:39 2020 -0700
Label_Woes
commit ed23505054cd1bdf2ef695b6b010e025382f38da
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:10:45 2020 -0700
Label_Woes
commit 001e721530c41fd8ad8e925cecdef2eb8c96ab4c
Merge: f88683766 8210da6e8
Author: snipe <snipe@snipe.net>
Date: Wed May 20 10:21:52 2020 -0700
Merge pull request #8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82018afab07197abe591a7666a56af21
Author: Daniel Meltzer <dmeltzer.devel@gmail.com>
Date: Wed May 20 10:29:27 2020 -0400
Fix Missing Category selection in Asset Model Modal dialog.
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
commit f88683766b1c7e9636aebe2fc952e6f036d3882c
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:55:47 2020 -0700
Roll back previous change
Signed-off-by: snipe <snipe@snipe.net>
commit e4385c0f8c584061670a1f98b13bbe90a124ac05
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:48:30 2020 -0700
Fixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa4e5569bd7ca28354ca282ca2ef2825
Author: snipe <snipe@snipe.net>
Date: Tue May 12 10:31:54 2020 -0700
Fix for session fixation vulnerability
Signed-off-by: snipe <snipe@snipe.net>
commit 7fb3a9b82c09b3aab65bf2b00f76efc66356155e
Merge: 9a2ed804c ecb1e87fe
Author: snipe <snipe@snipe.net>
Date: Mon May 11 22:41:36 2020 -0700
Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6e7ab67900936a0f158670cc4c21c56
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:45:15 2020 -0700
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
commit f43df5f04147ded31cc625ef92f87127993e94b3
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:44:46 2020 -0700
Fixed form label
Signed-off-by: snipe <snipe@snipe.net>
commit 95cc48e422e54b373d3a88d20d15d7536a323dce
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:41:10 2020 -0700
Added option to disable backup in import
Signed-off-by: snipe <snipe@snipe.net>
commit 9a2ed804ca9f71a9705da604a2c721ceeb9a5567
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:42 2020 -0700
Fixed mismatched HTML header tags
Signed-off-by: snipe <snipe@snipe.net>
commit d20fad28e5e807c7577d9bd0e5146e5607affa33
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:24 2020 -0700
Use more modern request helper
Signed-off-by: snipe <snipe@snipe.net>
commit ae813ddf75b21c45420016033c667ee35a9fc52b
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:11:16 2020 -0700
Add @alek13 as a contributor
commit bb42109c0c76b6709f39190ae4a1daa55865d306
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:10:45 2020 -0700
Added a clarifying comment
Signed-off-by: snipe <snipe@snipe.net>
commit f46ecf8ec0c1723e2e04036357c74644c30d4cb7
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:20 2020 -0700
Updated composer lock
Signed-off-by: snipe <snipe@snipe.net>
commit b9e821c0e65e0745064b42aa6cccf9627c5df3e6
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:14 2020 -0700
Small fix for Group Functional Tests
Signed-off-by: snipe <snipe@snipe.net>
commit 9ee28c7513616018f8ff0b8f5b167469e19070eb
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:02 2020 -0700
Switched to use info instead of danger on undeployable statuses
Signed-off-by: snipe <snipe@snipe.net>
commit 1a8ba06702727b1de870d05df53443270b35b8b7
Merge: 0fd232e70 ee4d69b1c
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:32 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 0fd232e70d2be9ce845a73745ac98800bcfef9e2
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:24 2020 -0700
Fixed group functional test
(We had changed the minimum to 2 instead of 3)
Signed-off-by: snipe <snipe@snipe.net>
commit ee4d69b1c59c6baf832574da9e9bbbe67248a4bc
Merge: 31c535094 d1ad11194
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:52:45 2020 -0700
Merge pull request #8041 from alek13/patch-1
use supported package for slack
commit d1ad11194936c51050d2e7a77d01c0daa1dde4fd
Author: Alexander Chibrikin <alek13.me@gmail.com>
Date: Mon May 11 20:31:13 2020 +0300
use supported package for slack
see https://github.com/maknz/slack/issues/94
commit 31c5350941c7330aed01652b0670b61f6660b15b
Author: snipe <snipe@snipe.net>
Date: Fri May 1 01:05:48 2020 -0700
Fixed incorrect route for groups edit
Signed-off-by: snipe <snipe@snipe.net>
commit 7eb70e17e0b4d0f1ed1fe3ed7fbff1728eb077fb
Merge: 5bb4f271a 3dfcb4699
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:50:37 2020 -0700
Merge pull request #7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb469910456b3213e00c5cd2f839d25dbf2c7
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:41:08 2020 -0700
Minor formatting changes
Signed-off-by: snipe <snipe@snipe.net>
commit 96eb96f964c40b798d5ceed25eff2bbef4f0bc51
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:27:00 2020 -0700
Removed stray val (typo)
Signed-off-by: snipe <snipe@snipe.net>
commit a2f08bd3baa6fb23633ceb58e5408b125b0f0029
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:08:54 2020 -0700
Added comments
Signed-off-by: snipe <snipe@snipe.net>
commit e009fbe59f39a717a4ad7bea5027d39cb5323225
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:04:53 2020 -0700
Converted table heading icons in People to CSS glyphs
Signed-off-by: snipe <snipe@snipe.net>
commit 5bb4f271aaa42a0c211d25e06a500a76c5a224f4
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 00:47:19 2020 -0700
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
]
);
Route :: post ( '{consumable}/checkout' ,
[
'as' => 'api.consumables.checkout' ,
2021-06-10 13:15:52 -07:00
'uses' => 'ConsumablesController@checkout' ,
Squashed commit of the following:
commit e321aeabaed580f8de6ee309b377654620f117be
Merge: 8ec99ff43 37568ae9e
Author: snipe <snipe@snipe.net>
Date: Mon Aug 31 12:14:44 2020 -0700
Merge branch 'master' into integrations/2020-08-31-v5-rc
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
commit 37568ae9ec021789d910de91bdef5f64e517451a
Merge: 01a832169 32ad9050c
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:49:37 2020 -0700
Merge pull request #8365 from snipe/fixes/8338_google_maps_CSP
Fixed #8338 - Added google maps to CSP
commit 32ad9050cff8a9bfc89e5a832a9bbf1ad03dadd3
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:48:53 2020 -0700
Added google maps to CSP
commit 01a832169c7572960340e743e569fe9ffdc3f996
Merge: bcad49ce7 3c6883489
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:38:31 2020 -0700
Merge pull request #8364 from snipe/fixes/8335_assigned_to_null_on_status_assetlist
Fixed #8335 - added assignedTo scope on status labels API call for assetlist
commit 3c6883489c030df8d90e2f18cab3ad96121205e5
Author: snipe <snipe@snipe.net>
Date: Tue Aug 25 20:37:30 2020 -0700
Added assignedTo scope
commit bcad49ce79ad7aab99bec8b273a78bb531c48ef0
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:10:22 2020 -0700
Try to better handle slack “too many requests” issue
commit b5acca89d72a43f42fb81a4bf06e8b7c3da0b93b
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 16:02:15 2020 -0700
Check for admin for slack notifications
commit e52919cf1b17871c6bf294cfb1a9be59f6033289
Merge: 714576be4 29f3a5c48
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:35:15 2020 -0700
Merge pull request #8327 from snipe/features/checkin_license_from_all_users
Checkin license from all users cli tool
commit 29f3a5c48f9b9fc4fcfb19cc6eebb1ce1e0e5a91
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:27:40 2020 -0700
Use more verbose annotation for Auth::user if/else
commit 134e8e6fb9958e71b8fa960de53c041324bd9e1c
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 15:25:07 2020 -0700
Moved user email nulling until after the save
commit 714576be45dabe9a2b23d3090ec0c72ab8ec28da
Merge: b999c50a2 512899294
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Aug 14 15:24:03 2020 -0700
Merge pull request #8328 from snipe/fix_deprecation_report
Fix deprecation report for customers with many active assets
commit 5128992940b8565e5e87a2a917d3bcde8e21b711
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Fri Aug 14 15:03:03 2020 -0700
Fix deprecation report for customers with many active assets
commit 02913235020d242e959f274fec588d9ebf8e39fa
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:57:58 2020 -0700
Use the user as the target
commit e0f6f9b83972ef9fde79dbc342555580a0574591
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:37 2020 -0700
Artisan command to check in licenses from all users
commit f1a6308002caa865fe1a9b17b91d34fbfdd94a75
Author: snipe <snipe@snipe.net>
Date: Fri Aug 14 14:43:07 2020 -0700
Check for Auth::user before trying to log id (for cli)
commit b999c50a2eef14bdf44be8e4359f794194170d2d
Merge: 9ca20e496 e3906b245
Author: snipe <snipe@snipe.net>
Date: Wed Aug 12 12:37:47 2020 -0700
Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation
Looks great, thank you!
commit e3906b245c9b85eca723bffa88b9af28f290e0fe
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Aug 12 12:27:18 2020 -0700
added translation for admin/licenses/message.not_found
commit 9ca20e4964e57621af8f6b2e790e0d68b69b1afb
Merge: e0644dbbf 456a74d88
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Tue Aug 11 17:33:19 2020 -0700
Merge pull request #8313 from snipe/improve_ldap_search_error_reporting
Improve ldap search error reporting
commit 456a74d88c1b1f14828aaf63e5122eb8b6831755
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:41:20 2020 -0700
De-merge out incorrectly merged files. Whoops!
commit 799c059070eff849c81550423d16344748522bc7
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Tue Aug 11 16:21:18 2020 -0700
Add internationalized version of LDAP error message
commit c62d43a77831dd798054b95e7ad9e72210f6accf
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:04:17 2020 -0700
Improve Exception management in Artisan LDAP Sync method. Still need to localize this better
commit b725bd0fae2b062d81a460283aa07b2186a99197
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Aug 10 17:23:04 2020 -0700
Add @PeterUpfold as a contributor
commit e0644dbbf6b5601b6712ca16877b481799e9652c
Merge: 5b6925b00 004ecad05
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Mon Aug 10 17:22:31 2020 -0700
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
commit 5b6925b00c04b1abdea0235d04dda32c89215201
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 21:00:37 2020 -0700
Removed debugging :(
commit df17a859bfab8876d3e849c42692e01bdfdbd886
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:59:54 2020 -0700
Changed modal IDs so manager creation modal works on user creation main page
commit 24c43056ba9e738334eb2310db7c9920d9ab0613
Author: snipe <snipe@snipe.net>
Date: Tue Aug 4 20:58:28 2020 -0700
Moved pGenerator script to default layout footer
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
commit 606b7e905df1918336cef64984e54207ca6a7644
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 17:02:33 2020 -0700
Small edits to PR template
Slight text changes to ask specifics about versions
commit d73ddad477cb9c675f15fbd54bdb1486bf8f14fc
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 16:59:26 2020 -0700
Created a PR template
First draft of the PR guidelines template
commit 9a39cf721e82aa25623e41eeb280d7bed3b3c178
Merge: 7410b1683 8994f3e15
Author: snipe <snipe@snipe.net>
Date: Fri Jul 31 12:18:49 2020 -0700
Merge pull request #8258 from ballertv/features/consumable-api
This looks great, thank you!
commit 7410b16835bab1563bf2b7baaddb55377083a3a0
Merge: e955c983a b09e7d19b
Author: Brady Wetherington <bwetherington@grokability.com>
Date: Fri Jul 24 16:22:44 2020 -0700
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4
Add new useraccountcontrol value for valid AD users
commit 8994f3e15e9fef5d1ec9c44764b424fa7edf9448
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 19:57:06 2020 -0400
cleanup
commit d23f1a77cac396a3a4962c5993cf1bdbfcf52a29
Author: andres <andresgutierrez535@gmail.com>
Date: Wed Jul 22 18:46:02 2020 -0400
implement checkout API
commit e955c983a3a9bd7793cf9a5f63b6e2c56d53d63f
Merge: 2fa17ac18 eed41e454
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 13:43:29 2020 -0700
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer
Added address, city, state and country to importer and city to bulk editor
commit b09e7d19b3bc424d5960de9f5ffd272b2f19c272
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Wed Jul 22 13:32:16 2020 -0700
Add new useraccountcontrol value for valid AD users; document algorithm and values
commit 2fa17ac18557969f5627953f6d041610207656a6
Merge: b90515437 3b1e46f72
Author: snipe <snipe@snipe.net>
Date: Wed Jul 22 12:06:31 2020 -0700
Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
commit 3b1e46f72b81bd27e5ba0783c88f9d0d0038d611
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:25:57 2020 -0700
Update general.php
commit 0c1a1de2a21dfd3639e3d2d2df995c3452c15a11
Author: Godfrey Martinez <47435081+Godmartinz@users.noreply.github.com>
Date: Wed Jul 22 11:24:36 2020 -0700
Update general.php
fixed typo
commit 20c9ae5818ae22846bf2149f261e7f70cc8a7c71
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed Jul 22 10:21:19 2020 -0700
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats
commit eed41e454962bb6e9e6cbcf79cb4aed292ac2bbf
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:57:32 2020 -0700
Moved address down further, fixed broken HTML
commit b750f4754f5f4245c0f490f6b6832b4c10615f27
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:54 2020 -0700
Added city to bulk user importer
commit c17a06792a76ee11215bd576f2df9732416b3e9d
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:49:38 2020 -0700
Added address, city, state, country to user importer
commit 4f76cc6cfbad1eeded1981e8569e915ca37b87d9
Author: snipe <snipe@snipe.net>
Date: Tue Jul 21 16:46:13 2020 -0700
I don’t actually know what this file is for
commit b905154373bcf0b1ef64d57bb95f184557caba37
Author: snipe <snipe@snipe.net>
Date: Mon Jul 20 14:29:32 2020 -0700
Fixed #8247 - added notes field to user details display
commit daf748e531324215bfd746b406407fee7476d0ab
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:32:01 2020 -0700
Bumped hash
commit 799a93c46a198a8235bbce1527ea7bf4929129c2
Author: snipe <snipe@snipe.net>
Date: Fri Jul 17 12:11:32 2020 -0700
Allow for email/username search on users
commit 34aa12e229fef497b355a492b5ef2c003337786b
Merge: 81a633288 897757bd0
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:44:13 2020 -0700
Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create
Set location_id to rtd_location_id on asset creation
commit 897757bd0461cefd2e82aba344d416ed6843c49c
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 17:43:44 2020 -0700
Removed added line for location
commit c7125c39375b101f852930536dabcc079f2d5e88
Author: snipe <snipe@snipe.net>
Date: Thu Jul 16 16:34:39 2020 -0700
Set location_id to rtd_location_id on asset creation
commit 81a6332889e9e4684ee65a669bc2b3bc1a3ced50
Author: snipe <snipe@snipe.net>
Date: Tue Jul 14 13:55:38 2020 -0700
Removed license ID from seats table cookie info
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
commit 6e563f6e4bfd9f8b52c8c8d39a60b466e64ba654
Merge: 5320f5c67 7f69ae953
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:54 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 5320f5c67ce7dbf4605cc5b7fd7be8773c8ee157
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:45 2020 -0700
Disallow non-super users from editing their own permissions
commit 7f69ae953b7990107bd0db3de16621e5238136e9
Merge: c79f8c1ba 17f6fbabf
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 21:16:00 2020 -0700
Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 17f6fbabfaa15f203a6accecf6a7b83c35d56ef8
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 21:12:03 2020 -0700
Switch to 'items' to maintain compatbility with other internal API's
commit c79f8c1baf920f41d43827094691275eec529448
Merge: 12c92e30b 536401fe0
Author: snipe <snipe@snipe.net>
Date: Mon Jul 13 17:42:16 2020 -0700
Merge pull request #8207 from EDVLeer/patch-1
Update snipeit.sh
commit e7a820f7c91c14280f96e0e58f9921f73cf88c43
Author: Brady Wetherington <uberbrady@gmail.com>
Date: Mon Jul 13 17:14:31 2020 -0700
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
commit 12c92e30b7a20ecd0e45b5a052b43c81dd35cc97
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 16:21:27 2020 -0700
Show whether or not the user was imported via LDAP in the view page
commit fd10b755b0241e354a265454c13965228a265a85
Author: snipe <snipe@snipe.net>
Date: Fri Jul 10 11:30:01 2020 -0700
Removed the sr-only tag in table headers
It was breaking Bootstrap Tables column selector :(
commit dbbb7680d9d92ab42ffcca825fd93ff6cc3e5f89
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 21:12:50 2020 -0700
A few more fixes for the cli
Do not check out a piece of software if it’s already been checked out to the user
commit cf0dd5bbadef3689dd9110d96e7d060ddb5fc827
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:43:13 2020 -0700
Small fixes for cli tool
commit 25e53d8c7f4ba1d5977bb5fbc5265ac9c8c543d9
Merge: ec6ed256f 89d433b41
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:27:01 2020 -0700
Merge pull request #8216 from snipe/features/checkout_license_to_all_users
Added CLI tool to checkout license to all users
commit 89d433b41aa0de862cb60142c8d6ef80f339a958
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:26:02 2020 -0700
Removed duplicate seat call
commit e2570ada6f158dfc9acead583a0b2fa7fae17ca6
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:04:05 2020 -0700
CLI tool to checkout a license to ALL users
commit 45afe725a1f039dddd87537e16470963684f0711
Author: snipe <snipe@snipe.net>
Date: Thu Jul 9 20:03:47 2020 -0700
Only try to get the company if there is an auth’d user
(Needed for command line tools, where no Auth::user() is present)
commit 536401fe0ff97cd6a8077cef993bfe755ed46851
Author: EDVLeer <32170051+EDVLeer@users.noreply.github.com>
Date: Tue Jul 7 08:21:36 2020 +0200
Update snipeit.sh
Ubuntu 20.04
commit ec6ed256fbc7740f76ee22867b6fe2008ff7873e
Author: snipe <snipe@snipe.net>
Date: Mon Jul 6 18:45:43 2020 -0700
Bumped minor version
commit 2aaa7bed2d4fad6e8f7b101ecdae1f46ab8a00c2
Merge: 339bdddc3 cc9f1577a
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 18:37:41 2020 -0700
Merge pull request #8183 from snipe/features/merge_users
Added merge utility
commit cc9f1577a47708a6e11dffeab4797982be243cfa
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:43:53 2020 -0700
Removed unused use directives
commit ab1fe8be0c72522273c468dfd5551553d9f92665
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 17:42:39 2020 -0700
Added merge utility
commit 339bdddc384aa655fa186dc36e02cc587487d4af
Author: snipe <snipe@snipe.net>
Date: Thu Jun 25 11:00:33 2020 -0700
Fix for Vue js not loading due to CSP :(
commit 35b9cf4b703b9ced785daec1d35973ca266cdc49
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 02:41:59 2020 -0700
Fixed missing db prefix on scopeDueOrOverdueForAudit
commit 7ccb41371e0efc46d51abc790f49a9fb73e9b8bc
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:09:39 2020 -0700
Removed unoptimized images directive
securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯
commit 2e60a457bf45640a0563a2bc4b66e02b0d226271
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 01:07:00 2020 -0700
Dumb fix for feature-policy being dumb.
commit 2390d2160bff7b4b340696fa527b1bc871bddff1
Merge: b42801f6a 00b051b8c
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:27:47 2020 -0700
Merge pull request #8164 from snipe/features/additional_security_headers
Additional security headers
commit 00b051b8c7f1af5218a11f2b33fcab37934bd894
Author: snipe <snipe@snipe.net>
Date: Tue Jun 23 00:26:09 2020 -0700
Added a few more comments
commit 05b3a9ad7e72cc71b09ed8ef2e87db19fa3700ee
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 23:17:27 2020 -0700
Config variable for HSTS
commit 4fb880384fd455bd59a3b91c4244c392d7198c48
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:37:14 2020 -0700
Changed comment
commit 43042ad8412d8d89a9b09e47e5da8b276c9655f2
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:35:59 2020 -0700
Consolidated ReferrerPolicy into new SecurityHeaders file
commit a716382ac43d0a58b96604a3ec15e389b7ae97c2
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:33:37 2020 -0700
Removed CSP middleware (it’s added in the general header)
commit 36c8f7f4f116666c63ae7bc0d12e15f77a8fd6bc
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 22:31:01 2020 -0700
Additional security headers
commit b42801f6ae635e843d9e062b4119d86fb3d05fc6
Merge: de4934f21 946129f20
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:47:35 2020 -0700
Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
commit 946129f20614e65bbbecbbda70cfba81b89d0937
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:45:20 2020 -0700
Made quote style consistent
commit b941ef1e08f84f40f503db6ebe67d0e8dca9c74a
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:41:40 2020 -0700
Pulled CSS font awesome styles out of the blade and into overrides.css
commit d1aa11ec89347fb2c139d751719c4459c2448321
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 20:29:19 2020 -0700
Fix for weird padlock display in asset listing with encrypted custom fields
commit de4934f21d34a628e57992fc6a59813f42c55d90
Merge: af06e4205 b10076b01
Author: snipe <snipe@snipe.net>
Date: Mon Jun 22 17:28:38 2020 -0700
Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
commit b10076b015ac0034fded62548135aaff3f1b2a0a
Author: Godfrey M <godmartinz@gmail.com>
Date: Mon Jun 22 17:04:39 2020 -0700
corrected an error where font-size for labels were static in settings.
commit af06e4205627b29f583b2e2e770fd2913fce5e46
Author: snipe <snipe@snipe.net>
Date: Wed Jun 17 11:17:25 2020 -0700
Bumped version
commit 9a2440dc4b98a9c12b38a04504875c7c196a510c
Merge: beae8efb2 2ac1c1636
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 20:20:07 2020 -0700
Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
commit 2ac1c1636c672db59d601bd5c73d4a8023533ec9
Author: snipe <snipe@snipe.net>
Date: Tue Jun 16 16:12:57 2020 -0700
Better handle the logic to determine if we should display the license checkout blade
commit 004ecad059d636cc5be62aa5f112e3c4f9762326
Author: Peter Upfold <pgithub@upfold.org.uk>
Date: Wed Jun 3 08:59:50 2020 +0100
Force suppress deprecation warning on ldap_control_paged_result()
commit beae8efb21c2675b3da4308a87d911c534e70361
Merge: d14ab7e3e 9839e5e56
Author: snipe <snipe@snipe.net>
Date: Wed May 27 23:01:33 2020 -0700
Merge pull request #8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
commit 9839e5e566f51f85abe6860dfc8377042834c89b
Author: Godfrey M <godmartinz@gmail.com>
Date: Wed May 27 12:27:40 2020 -0700
adjusted for all label text, removed local variable
commit d14ab7e3e1bf09c931ad148fdb6b65ee5a3dc7b8
Author: snipe <snipe@snipe.net>
Date: Wed May 27 00:22:44 2020 -0700
Porting change from #8053 to master
Signed-off-by: snipe <snipe@snipe.net>
commit e7f74d94c179730f8b8502da5e2c1c90fa8ec594
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:22:45 2020 -0700
Label_Woes
commit e97cf011b65df9e66826c26464fed7bf4001917a
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:15:39 2020 -0700
Label_Woes
commit ed23505054cd1bdf2ef695b6b010e025382f38da
Author: Godfrey M <godmartinz@gmail.com>
Date: Tue May 26 17:10:45 2020 -0700
Label_Woes
commit 001e721530c41fd8ad8e925cecdef2eb8c96ab4c
Merge: f88683766 8210da6e8
Author: snipe <snipe@snipe.net>
Date: Wed May 20 10:21:52 2020 -0700
Merge pull request #8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
commit 8210da6e82018afab07197abe591a7666a56af21
Author: Daniel Meltzer <dmeltzer.devel@gmail.com>
Date: Wed May 20 10:29:27 2020 -0400
Fix Missing Category selection in Asset Model Modal dialog.
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
commit f88683766b1c7e9636aebe2fc952e6f036d3882c
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:55:47 2020 -0700
Roll back previous change
Signed-off-by: snipe <snipe@snipe.net>
commit e4385c0f8c584061670a1f98b13bbe90a124ac05
Author: snipe <snipe@snipe.net>
Date: Thu May 14 00:48:30 2020 -0700
Fixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
commit 0550fe0ffa4e5569bd7ca28354ca282ca2ef2825
Author: snipe <snipe@snipe.net>
Date: Tue May 12 10:31:54 2020 -0700
Fix for session fixation vulnerability
Signed-off-by: snipe <snipe@snipe.net>
commit 7fb3a9b82c09b3aab65bf2b00f76efc66356155e
Merge: 9a2ed804c ecb1e87fe
Author: snipe <snipe@snipe.net>
Date: Mon May 11 22:41:36 2020 -0700
Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
commit ecb1e87fe6e7ab67900936a0f158670cc4c21c56
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:45:15 2020 -0700
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
commit f43df5f04147ded31cc625ef92f87127993e94b3
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:44:46 2020 -0700
Fixed form label
Signed-off-by: snipe <snipe@snipe.net>
commit 95cc48e422e54b373d3a88d20d15d7536a323dce
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:41:10 2020 -0700
Added option to disable backup in import
Signed-off-by: snipe <snipe@snipe.net>
commit 9a2ed804ca9f71a9705da604a2c721ceeb9a5567
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:42 2020 -0700
Fixed mismatched HTML header tags
Signed-off-by: snipe <snipe@snipe.net>
commit d20fad28e5e807c7577d9bd0e5146e5607affa33
Author: snipe <snipe@snipe.net>
Date: Mon May 11 20:28:24 2020 -0700
Use more modern request helper
Signed-off-by: snipe <snipe@snipe.net>
commit ae813ddf75b21c45420016033c667ee35a9fc52b
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:11:16 2020 -0700
Add @alek13 as a contributor
commit bb42109c0c76b6709f39190ae4a1daa55865d306
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:10:45 2020 -0700
Added a clarifying comment
Signed-off-by: snipe <snipe@snipe.net>
commit f46ecf8ec0c1723e2e04036357c74644c30d4cb7
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:20 2020 -0700
Updated composer lock
Signed-off-by: snipe <snipe@snipe.net>
commit b9e821c0e65e0745064b42aa6cccf9627c5df3e6
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:14 2020 -0700
Small fix for Group Functional Tests
Signed-off-by: snipe <snipe@snipe.net>
commit 9ee28c7513616018f8ff0b8f5b167469e19070eb
Author: snipe <snipe@snipe.net>
Date: Mon May 11 18:07:02 2020 -0700
Switched to use info instead of danger on undeployable statuses
Signed-off-by: snipe <snipe@snipe.net>
commit 1a8ba06702727b1de870d05df53443270b35b8b7
Merge: 0fd232e70 ee4d69b1c
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:32 2020 -0700
Merge branch 'master' of https://github.com/snipe/snipe-it
commit 0fd232e70d2be9ce845a73745ac98800bcfef9e2
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:53:24 2020 -0700
Fixed group functional test
(We had changed the minimum to 2 instead of 3)
Signed-off-by: snipe <snipe@snipe.net>
commit ee4d69b1c59c6baf832574da9e9bbbe67248a4bc
Merge: 31c535094 d1ad11194
Author: snipe <snipe@snipe.net>
Date: Mon May 11 17:52:45 2020 -0700
Merge pull request #8041 from alek13/patch-1
use supported package for slack
commit d1ad11194936c51050d2e7a77d01c0daa1dde4fd
Author: Alexander Chibrikin <alek13.me@gmail.com>
Date: Mon May 11 20:31:13 2020 +0300
use supported package for slack
see https://github.com/maknz/slack/issues/94
commit 31c5350941c7330aed01652b0670b61f6660b15b
Author: snipe <snipe@snipe.net>
Date: Fri May 1 01:05:48 2020 -0700
Fixed incorrect route for groups edit
Signed-off-by: snipe <snipe@snipe.net>
commit 7eb70e17e0b4d0f1ed1fe3ed7fbff1728eb077fb
Merge: 5bb4f271a 3dfcb4699
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:50:37 2020 -0700
Merge pull request #7993 from snipe/fixes/7989_column_selector
Fixed #7989 - Converted table heading icons in People to CSS glyphs
commit 3dfcb469910456b3213e00c5cd2f839d25dbf2c7
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:41:08 2020 -0700
Minor formatting changes
Signed-off-by: snipe <snipe@snipe.net>
commit 96eb96f964c40b798d5ceed25eff2bbef4f0bc51
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:27:00 2020 -0700
Removed stray val (typo)
Signed-off-by: snipe <snipe@snipe.net>
commit a2f08bd3baa6fb23633ceb58e5408b125b0f0029
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:08:54 2020 -0700
Added comments
Signed-off-by: snipe <snipe@snipe.net>
commit e009fbe59f39a717a4ad7bea5027d39cb5323225
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 04:04:53 2020 -0700
Converted table heading icons in People to CSS glyphs
Signed-off-by: snipe <snipe@snipe.net>
commit 5bb4f271aaa42a0c211d25e06a500a76c5a224f4
Author: snipe <snipe@snipe.net>
Date: Fri Apr 24 00:47:19 2020 -0700
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets
Signed-off-by: snipe <snipe@snipe.net>
2020-08-31 12:17:19 -07:00
]
);
});
2017-02-01 18:50:28 -08:00
2017-02-23 16:32:35 -08:00
/*--- Depreciations API ---*/
2017-02-01 18:50:28 -08:00
2017-02-01 17:59:03 -08:00
Route :: resource ( 'depreciations' , 'DepreciationsController' ,
2017-02-23 16:32:35 -08:00
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.depreciations.index' ,
'show' => 'api.depreciations.show' ,
'store' => 'api.depreciations.store' ,
'update' => 'api.depreciations.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.depreciations.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'depreciation' => 'depreciation_id' ],
2017-02-01 17:59:03 -08:00
]
2017-02-23 16:32:35 -08:00
); // Depreciations resource
2017-02-01 17:59:03 -08:00
2017-02-23 16:32:35 -08:00
/*--- Fields API ---*/
2017-01-12 19:41:01 -08:00
2018-01-17 05:31:57 -08:00
Route :: resource ( 'fields' , 'CustomFieldsController' , [
'names' => [
'index' => 'api.customfields.index' ,
'show' => 'api.customfields.show' ,
'store' => 'api.customfields.store' ,
'update' => 'api.customfields.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.customfields.destroy' ,
2018-01-17 05:31:57 -08:00
],
2021-06-10 13:15:52 -07:00
'except' => [ 'create' , 'edit' ],
'parameters' => [ 'field' => 'field_id' ],
2018-01-17 05:31:57 -08:00
]);
2017-02-23 16:32:35 -08:00
Route :: group ([ 'prefix' => 'fields' ], function () {
Route :: post ( 'fieldsets/{id}/order' ,
2017-01-12 19:41:01 -08:00
[
2017-02-23 16:32:35 -08:00
'as' => 'api.customfields.order' ,
2021-06-10 13:15:52 -07:00
'uses' => 'CustomFieldsController@postReorder' ,
2017-09-18 12:29:08 -07:00
]
);
2018-01-22 13:14:04 -08:00
Route :: post ( '{field}/associate' ,
[
'as' => 'api.customfields.associate' ,
2021-06-10 13:15:52 -07:00
'uses' => 'CustomFieldsController@associate' ,
2018-01-22 13:14:04 -08:00
]
);
Route :: post ( '{field}/disassociate' ,
[
'as' => 'api.customfields.disassociate' ,
2021-06-10 13:15:52 -07:00
'uses' => 'CustomFieldsController@disassociate' ,
2018-01-22 13:14:04 -08:00
]
);
2017-02-23 16:32:35 -08:00
}); // Fields group
2017-07-12 17:51:22 -07:00
/*--- Fieldsets API ---*/
2018-01-22 13:14:04 -08:00
Route :: group ([ 'prefix' => 'fieldsets' ], function () {
Route :: get ( '{fieldset}/fields' ,
[
'as' => 'api.fieldsets.fields' ,
2021-06-10 13:15:52 -07:00
'uses' => 'CustomFieldsetsController@fields' ,
2018-01-22 13:14:04 -08:00
]
);
2018-04-23 21:16:55 -07:00
Route :: get ( '/{fieldset}/fields/{model}' ,
[
'as' => 'api.fieldsets.fields-with-default-value' ,
2021-06-10 13:15:52 -07:00
'uses' => 'CustomFieldsetsController@fieldsWithDefaultValues' ,
2018-04-23 21:16:55 -07:00
]
);
2018-01-22 13:14:04 -08:00
});
2017-07-12 19:24:21 -07:00
Route :: resource ( 'fieldsets' , 'CustomFieldsetsController' ,
2017-07-12 17:51:22 -07:00
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-07-12 19:24:21 -07:00
'index' => 'api.fieldsets.index' ,
'show' => 'api.fieldsets.show' ,
'store' => 'api.fieldsets.store' ,
'update' => 'api.fieldsets.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.fieldsets.destroy' ,
2017-07-12 19:24:21 -07:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'fieldset' => 'fieldset_id' ],
2017-07-12 19:24:21 -07:00
]
); // Custom fieldset resource
2017-02-23 16:32:35 -08:00
/*--- Groups API ---*/
Route :: resource ( 'groups' , 'GroupsController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.groups.index' ,
'show' => 'api.groups.show' ,
'store' => 'api.groups.store' ,
'update' => 'api.groups.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.groups.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'group' => 'group_id' ],
2017-01-12 19:41:01 -08:00
]
2017-02-23 16:32:35 -08:00
); // Groups resource
2017-01-12 19:41:01 -08:00
2017-02-23 16:32:35 -08:00
/*--- Hardware API ---*/
2017-02-01 17:59:03 -08:00
2017-03-11 14:04:52 -08:00
Route :: group ([ 'prefix' => 'hardware' ], function () {
2021-06-10 13:15:52 -07:00
Route :: get ( '{asset_id}/licenses' , [
2019-01-22 14:47:40 -08:00
'as' => 'api.assets.licenselist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@licenses' ,
2019-01-22 14:47:40 -08:00
]);
2021-06-10 13:15:52 -07:00
Route :: get ( 'bytag/{tag}' , [
2018-03-23 14:50:11 -07:00
'as' => 'assets.show.bytag' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@showByTag' ,
2018-03-23 14:50:11 -07:00
]);
2017-03-11 14:04:52 -08:00
2020-03-06 14:55:20 -08:00
Route :: get ( 'bytag/{any}' ,
[
'as' => 'api.assets.show.bytag' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@showByTag' ,
2020-03-06 14:55:20 -08:00
]
) -> where ( 'any' , '.*' );
2018-03-23 14:50:11 -07:00
2020-03-06 14:55:20 -08:00
Route :: get ( 'byserial/{any}' ,
[
'as' => 'api.assets.show.byserial' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@showBySerial' ,
2020-03-06 14:55:20 -08:00
]
) -> where ( 'any' , '.*' );
2018-03-23 14:50:11 -07:00
2021-06-10 13:15:52 -07:00
Route :: get ( 'selectlist' , [
2017-10-26 02:28:17 -07:00
'as' => 'assets.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@selectlist' ,
2017-10-26 02:28:17 -07:00
]);
2019-05-05 19:32:52 -07:00
Route :: get ( 'audit/{audit}' , [
'as' => 'api.asset.to-audit' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@index' ,
2019-05-05 19:32:52 -07:00
]);
2017-08-29 16:00:22 -07:00
Route :: post ( 'audit' , [
2017-08-25 10:04:19 -07:00
'as' => 'api.asset.audit' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@audit' ,
2017-08-25 10:04:19 -07:00
]);
2017-03-11 15:25:19 -08:00
Route :: post ( '{asset_id}/checkout' ,
2017-03-11 14:04:52 -08:00
[
'as' => 'api.assets.checkout' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@checkout' ,
2017-03-11 14:04:52 -08:00
]
);
2017-03-11 15:25:19 -08:00
Route :: post ( '{asset_id}/checkin' ,
2017-03-11 14:04:52 -08:00
[
'as' => 'api.assets.checkin' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetsController@checkin' ,
2017-03-11 14:04:52 -08:00
]
);
});
2017-08-22 13:52:06 -07:00
/*--- Asset Maintenances API ---*/
Route :: resource ( 'maintenances' , 'AssetMaintenancesController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-08-22 13:52:06 -07:00
'index' => 'api.maintenances.index' ,
'show' => 'api.maintenances.show' ,
'store' => 'api.maintenances.store' ,
'update' => 'api.maintenances.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.maintenances.destroy' ,
2017-08-22 13:52:06 -07:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'maintenance' => 'maintenance_id' ],
2017-08-22 13:52:06 -07:00
]
); // Consumables resource
2017-02-23 16:32:35 -08:00
Route :: resource ( 'hardware' , 'AssetsController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.assets.index' ,
'show' => 'api.assets.show' ,
'store' => 'api.assets.store' ,
'update' => 'api.assets.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.assets.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'asset' => 'asset_id' ],
2017-02-23 16:32:35 -08:00
]
); // Hardware resource
2017-02-01 17:59:03 -08:00
2017-02-23 16:32:35 -08:00
/*--- Imports API ---*/
2017-01-13 03:19:39 -08:00
2017-02-23 16:32:35 -08:00
Route :: resource ( 'imports' , 'ImportController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.imports.index' ,
'show' => 'api.imports.show' ,
'store' => 'api.imports.store' ,
'update' => 'api.imports.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.imports.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'import' => 'import_id' ],
2017-02-23 16:32:35 -08:00
]
); // Imports resource
2017-01-13 03:19:39 -08:00
2017-02-23 16:32:35 -08:00
Route :: group ([ 'prefix' => 'imports' ], function () {
Route :: post ( 'process/{import}' ,
[
'as' => 'api.imports.importFile' ,
2021-06-10 13:15:52 -07:00
'uses' => 'ImportController@process' ,
2017-02-23 16:32:35 -08:00
]
);
}); // Imports group
2017-01-13 03:19:39 -08:00
2017-02-23 16:32:35 -08:00
/*--- Licenses API ---*/
2017-01-13 03:19:39 -08:00
2018-01-10 18:47:27 -08:00
Route :: group ([ 'prefix' => 'licenses' ], function () {
2019-02-19 11:19:00 -08:00
Route :: get ( 'selectlist' ,
[
'as' => 'api.licenses.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'LicensesController@selectlist' ,
2019-02-19 11:19:00 -08:00
]
);
2018-01-10 18:47:27 -08:00
}); // Licenses group
2017-02-23 16:32:35 -08:00
Route :: resource ( 'licenses' , 'LicensesController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.licenses.index' ,
'show' => 'api.licenses.show' ,
'store' => 'api.licenses.store' ,
'update' => 'api.licenses.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.licenses.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'license' => 'license_id' ],
2017-02-23 16:32:35 -08:00
]
); // Licenses resource
2017-01-13 03:19:39 -08:00
2021-03-29 19:41:26 -07:00
Route :: resource ( 'licenses.seats' , 'LicenseSeatsController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2021-03-29 19:41:26 -07:00
'index' => 'api.licenses.seats.index' ,
'show' => 'api.licenses.seats.show' ,
2021-06-10 13:15:52 -07:00
'update' => 'api.licenses.seats.update' ,
2021-03-29 19:41:26 -07:00
],
'except' => [ 'create' , 'edit' , 'destroy' , 'store' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'licenseseat' => 'licenseseat_id' ],
2021-03-29 19:41:26 -07:00
]
); // Licenseseats resource
2018-01-10 18:47:27 -08:00
2017-02-23 16:32:35 -08:00
/*--- Locations API ---*/
Route :: group ([ 'prefix' => 'locations' ], function () {
2017-08-25 06:04:22 -07:00
Route :: get ( '{location}/users' ,
[
'as' => 'api.locations.viewusers' ,
2021-06-10 13:15:52 -07:00
'uses' => 'LocationsController@getDataViewUsers' ,
2017-08-25 06:04:22 -07:00
]
);
Route :: get ( '{location}/assets' ,
[
'as' => 'api.locations.viewassets' ,
2021-06-10 13:15:52 -07:00
'uses' => 'LocationsController@getDataViewAssets' ,
2017-08-25 06:04:22 -07:00
]
);
2017-02-23 16:32:35 -08:00
// Do we actually still need this, now that we have an API?
Route :: get ( '{location}/check' ,
2017-01-12 19:41:01 -08:00
[
2017-02-23 16:32:35 -08:00
'as' => 'api.locations.check' ,
2021-06-10 13:15:52 -07:00
'uses' => 'LocationsController@show' ,
2017-02-23 16:32:35 -08:00
]
);
2017-10-26 02:28:17 -07:00
2021-06-10 13:15:52 -07:00
Route :: get ( 'selectlist' , [
2017-10-26 02:28:17 -07:00
'as' => 'locations.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'LocationsController@selectlist' ,
2017-10-26 02:28:17 -07:00
]);
2017-02-23 16:32:35 -08:00
}); // Locations group
2017-10-26 02:28:17 -07:00
Route :: resource ( 'locations' , 'LocationsController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-10-26 02:28:17 -07:00
'index' => 'api.locations.index' ,
'show' => 'api.locations.show' ,
'store' => 'api.locations.store' ,
'update' => 'api.locations.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.locations.destroy' ,
2017-10-26 02:28:17 -07:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'location' => 'location_id' ],
2017-10-26 02:28:17 -07:00
]
); // Locations resource
2017-02-23 16:32:35 -08:00
/*--- Manufacturers API ---*/
2017-10-26 22:09:08 -07:00
Route :: group ([ 'prefix' => 'manufacturers' ], function () {
2021-06-10 13:15:52 -07:00
Route :: get ( 'selectlist' , [
2017-10-26 22:09:08 -07:00
'as' => 'manufacturers.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'ManufacturersController@selectlist' ,
2017-10-26 22:09:08 -07:00
]);
}); // Locations group
2017-02-23 16:32:35 -08:00
Route :: resource ( 'manufacturers' , 'ManufacturersController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.manufacturers.index' ,
'show' => 'api.manufacturers.show' ,
'store' => 'api.manufacturers.store' ,
'update' => 'api.manufacturers.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.manufacturers.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'manufacturer' => 'manufacturer_id' ],
2017-01-12 19:41:01 -08:00
]
2017-02-23 16:32:35 -08:00
); // Manufacturers resource
2017-01-12 19:41:01 -08:00
2017-02-23 16:32:35 -08:00
/*--- Models API ---*/
2017-01-25 02:19:26 -08:00
2017-10-26 21:51:09 -07:00
Route :: group ([ 'prefix' => 'models' ], function () {
Route :: get ( 'assets' ,
[
'as' => 'api.models.assets' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetModelsController@assets' ,
2017-10-26 21:51:09 -07:00
]
);
Route :: get ( 'selectlist' ,
[
'as' => 'api.models.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'AssetModelsController@selectlist' ,
2017-10-26 21:51:09 -07:00
]
);
}); // Models group
2017-02-23 16:32:35 -08:00
Route :: resource ( 'models' , 'AssetModelsController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.models.index' ,
'show' => 'api.models.show' ,
'store' => 'api.models.store' ,
'update' => 'api.models.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.models.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'model' => 'model_id' ],
2017-02-23 16:32:35 -08:00
]
); // Models resource
2017-01-25 02:19:26 -08:00
2017-02-23 16:32:35 -08:00
/*--- Settings API ---*/
2017-10-16 05:52:18 -07:00
Route :: get ( 'settings/ldaptest' , [
'as' => 'api.settings.ldaptest' ,
2021-06-10 13:15:52 -07:00
'uses' => 'SettingsController@ldapAdSettingsTest' ,
2017-10-16 05:52:18 -07:00
]);
2017-10-16 06:34:04 -07:00
2020-10-05 20:34:17 -07:00
Route :: post ( 'settings/purge_barcodes' , [
'as' => 'api.settings.purgebarcodes' ,
2021-06-10 13:15:52 -07:00
'uses' => 'SettingsController@purgeBarcodes' ,
2020-10-05 20:34:17 -07:00
]);
2018-08-01 03:51:59 -07:00
Route :: get ( 'settings/login-attempts' , [
'middleware' => [ 'auth' , 'authorize:superuser' ],
'as' => 'api.settings.login_attempts' ,
2021-06-10 13:15:52 -07:00
'uses' => 'SettingsController@showLoginAttempts' ,
2017-10-16 05:52:18 -07:00
]);
2017-10-16 06:34:04 -07:00
Route :: post ( 'settings/ldaptestlogin' , [
'as' => 'api.settings.ldaptestlogin' ,
2021-06-10 13:15:52 -07:00
'uses' => 'SettingsController@ldaptestlogin' ,
2017-10-16 06:34:04 -07:00
]);
2017-10-19 08:18:56 -07:00
2018-02-22 16:35:34 -08:00
Route :: post ( 'settings/slacktest' , [
'as' => 'api.settings.slacktest' ,
2021-06-10 13:15:52 -07:00
'uses' => 'SettingsController@slacktest' ,
2018-02-22 16:35:34 -08:00
]);
2017-10-19 08:18:56 -07:00
Route :: post (
'settings/mailtest' ,
[
'as' => 'api.settings.mailtest' ,
2021-06-10 13:15:52 -07:00
'uses' => 'SettingsController@ajaxTestEmail' ,
2019-08-14 22:33:56 -07:00
]);
2017-10-19 08:18:56 -07:00
2017-02-23 16:32:35 -08:00
Route :: resource ( 'settings' , 'SettingsController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.settings.index' ,
'store' => 'api.settings.store' ,
'show' => 'api.settings.show' ,
2021-06-10 13:15:52 -07:00
'update' => 'api.settings.update' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' , 'destroy' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'setting' => 'setting_id' ],
2017-01-12 19:41:01 -08:00
]
2017-02-23 16:32:35 -08:00
); // Settings resource
2017-01-12 19:41:01 -08:00
2017-02-23 16:32:35 -08:00
/*--- Status Labels API ---*/
2017-01-12 19:41:01 -08:00
2017-02-23 16:32:35 -08:00
Route :: group ([ 'prefix' => 'statuslabels' ], function () {
2017-01-12 02:20:32 -08:00
2017-04-06 21:18:35 -07:00
// Pie chart for dashboard
Route :: get ( 'assets' ,
[
'as' => 'api.statuslabels.assets.bytype' ,
2021-06-10 13:15:52 -07:00
'uses' => 'StatuslabelsController@getAssetCountByStatuslabel' ,
2017-04-06 21:18:35 -07:00
]
);
2017-02-23 16:32:35 -08:00
Route :: get ( '{statuslabel}/assetlist' ,
[
'as' => 'api.statuslabels.assets' ,
2021-06-10 13:15:52 -07:00
'uses' => 'StatuslabelsController@assets' ,
2017-02-23 16:32:35 -08:00
]
);
2017-01-11 18:14:06 -08:00
2017-02-23 16:32:35 -08:00
Route :: get ( '{statuslabel}/deployable' ,
[
'as' => 'api.statuslabels.deployable' ,
2021-06-10 13:15:52 -07:00
'uses' => 'StatuslabelsController@checkIfDeployable' ,
2017-02-23 16:32:35 -08:00
]
);
2017-04-06 21:18:35 -07:00
});
Route :: resource ( 'statuslabels' , 'StatuslabelsController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-04-06 21:18:35 -07:00
'index' => 'api.statuslabels.index' ,
'store' => 'api.statuslabels.store' ,
'show' => 'api.statuslabels.show' ,
'update' => 'api.statuslabels.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.statuslabels.destroy' ,
2017-04-06 21:18:35 -07:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'statuslabel' => 'statuslabel_id' ],
2017-04-06 21:18:35 -07:00
]
);
// Status labels group
2017-01-11 18:14:06 -08:00
2017-02-23 16:32:35 -08:00
/*--- Suppliers API ---*/
2017-10-28 08:38:00 -07:00
Route :: group ([ 'prefix' => 'suppliers' ], function () {
Route :: get ( 'list' ,
[
'as' => 'api.suppliers.list' ,
2021-06-10 13:15:52 -07:00
'uses' => 'SuppliersController@getDatatable' ,
2017-10-28 08:38:00 -07:00
]
);
Route :: get ( 'selectlist' ,
[
'as' => 'api.suppliers.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'SuppliersController@selectlist' ,
2017-10-28 08:38:00 -07:00
]
);
2017-10-28 09:21:39 -07:00
}); // Suppliers group
2017-10-28 08:38:00 -07:00
2017-02-23 16:32:35 -08:00
Route :: resource ( 'suppliers' , 'SuppliersController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-02-23 16:32:35 -08:00
'index' => 'api.suppliers.index' ,
'show' => 'api.suppliers.show' ,
'store' => 'api.suppliers.store' ,
'update' => 'api.suppliers.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.suppliers.destroy' ,
2017-02-23 16:32:35 -08:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'supplier' => 'supplier_id' ],
2017-02-23 16:32:35 -08:00
]
); // Suppliers resource
2017-01-24 17:37:07 -08:00
2018-07-02 20:35:10 -07:00
/*--- Users API ---*/
2016-12-14 10:54:05 -08:00
2021-06-10 13:15:52 -07:00
Route :: group ([ 'prefix' => 'users' ], function () {
2017-02-23 16:32:35 -08:00
Route :: post ( 'two_factor_reset' ,
[
'as' => 'api.users.two_factor_reset' ,
2021-06-10 13:15:52 -07:00
'uses' => 'UsersController@postTwoFactorReset' ,
2017-02-23 16:32:35 -08:00
]
);
2016-12-14 10:54:05 -08:00
2018-07-02 20:35:10 -07:00
Route :: get ( 'me' ,
[
'as' => 'api.users.me' ,
2021-06-10 13:15:52 -07:00
'uses' => 'UsersController@getCurrentUserInfo' ,
2018-07-02 20:35:10 -07:00
]
);
2017-02-23 16:32:35 -08:00
Route :: get ( 'list/{status?}' ,
[
'as' => 'api.users.list' ,
2021-06-10 13:15:52 -07:00
'uses' => 'UsersController@getDatatable' ,
2017-02-23 16:32:35 -08:00
]
);
2016-12-14 10:54:05 -08:00
2017-10-24 19:24:35 -07:00
Route :: get ( 'selectlist' ,
[
'as' => 'api.users.selectlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'UsersController@selectList' ,
2017-10-24 19:24:35 -07:00
]
);
2017-02-23 16:32:35 -08:00
Route :: get ( '{user}/assets' ,
[
'as' => 'api.users.assetlist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'UsersController@assets' ,
2017-02-23 16:32:35 -08:00
]
);
2017-01-18 04:58:56 -08:00
2020-11-03 13:40:43 -08:00
Route :: get ( '{user}/accessories' ,
2019-03-01 17:21:03 -08:00
[
2020-11-03 13:40:43 -08:00
'as' => 'api.users.accessorieslist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'UsersController@accessories' ,
2019-03-01 17:21:03 -08:00
]
);
2019-12-19 18:00:36 -08:00
Route :: get ( '{user}/licenses' ,
[
'as' => 'api.users.licenselist' ,
2021-06-10 13:15:52 -07:00
'uses' => 'UsersController@licenses' ,
2019-12-19 18:00:36 -08:00
]
);
2017-02-23 16:32:35 -08:00
Route :: post ( '{user}/upload' ,
[
'as' => 'api.users.uploads' ,
2021-06-10 13:15:52 -07:00
'uses' => 'UsersController@postUpload' ,
2017-02-23 16:32:35 -08:00
]
2017-01-18 04:58:56 -08:00
);
2017-02-23 16:32:35 -08:00
}); // Users group
2017-01-18 04:58:56 -08:00
2017-10-24 19:24:35 -07:00
Route :: resource ( 'users' , 'UsersController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2017-10-24 19:24:35 -07:00
'index' => 'api.users.index' ,
'show' => 'api.users.show' ,
'store' => 'api.users.store' ,
'update' => 'api.users.update' ,
2021-06-10 13:15:52 -07:00
'destroy' => 'api.users.destroy' ,
2017-10-24 19:24:35 -07:00
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'user' => 'user_id' ],
2017-10-24 19:24:35 -07:00
]
); // Users resource
2017-05-23 09:24:53 -07:00
Route :: get (
'reports/activity' ,
2021-06-10 13:15:52 -07:00
[ 'as' => 'api.activity.index' , 'uses' => 'ReportsController@index' ]
2017-05-23 09:24:53 -07:00
);
2019-01-27 12:19:24 -08:00
/*--- Kits API ---*/
2018-10-19 07:30:25 -07:00
Route :: resource ( 'kits' , 'PredefinedKitsController' ,
[
2021-06-10 13:15:52 -07:00
'names' => [
2018-10-19 07:30:25 -07:00
'index' => 'api.kits.index' ,
'show' => 'api.kits.show' ,
'store' => 'api.kits.store' ,
'update' => 'api.kits.update' ,
'destroy' => 'api.kits.destroy' ,
],
'except' => [ 'create' , 'edit' ],
2021-06-10 13:15:52 -07:00
'parameters' => [ 'kit' => 'kit_id' ],
2018-10-19 07:30:25 -07:00
]
);
2021-06-10 13:15:52 -07:00
Route :: group ([ 'prefix' => 'kits/{kit_id}' ], function () {
2018-10-19 07:30:25 -07:00
2019-01-27 12:19:24 -08:00
// kit licenses
2021-06-10 13:15:52 -07:00
Route :: get ( 'licenses' ,
2018-10-19 07:30:25 -07:00
[
'as' => 'api.kits.licenses.index' ,
'uses' => 'PredefinedKitsController@indexLicenses' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: post ( 'licenses' ,
2018-10-19 07:30:25 -07:00
[
'as' => 'api.kits.licenses.store' ,
'uses' => 'PredefinedKitsController@storeLicense' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: put ( 'licenses/{license_id}' ,
2018-10-19 07:30:25 -07:00
[
'as' => 'api.kits.licenses.update' ,
'uses' => 'PredefinedKitsController@updateLicense' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: delete ( 'licenses/{license_id}' ,
2018-10-19 07:30:25 -07:00
[
'as' => 'api.kits.licenses.destroy' ,
2018-11-06 08:27:28 -08:00
'uses' => 'PredefinedKitsController@detachLicense' ,
2018-10-19 07:30:25 -07:00
]
);
2021-06-10 13:15:52 -07:00
2019-01-27 12:19:24 -08:00
// kit models
2021-06-10 13:15:52 -07:00
Route :: get ( 'models' ,
2018-10-19 07:30:25 -07:00
[
'as' => 'api.kits.models.index' ,
'uses' => 'PredefinedKitsController@indexModels' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: post ( 'models' ,
2018-10-19 07:30:25 -07:00
[
'as' => 'api.kits.models.store' ,
'uses' => 'PredefinedKitsController@storeModel' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: put ( 'models/{model_id}' ,
2018-10-19 07:30:25 -07:00
[
'as' => 'api.kits.models.update' ,
'uses' => 'PredefinedKitsController@updateModel' ,
]
);
2017-05-23 09:24:53 -07:00
2021-06-10 13:15:52 -07:00
Route :: delete ( 'models/{model_id}' ,
2018-10-19 07:30:25 -07:00
[
'as' => 'api.kits.models.destroy' ,
2018-11-06 08:27:28 -08:00
'uses' => 'PredefinedKitsController@detachModel' ,
2018-10-19 07:30:25 -07:00
]
);
2018-04-04 17:33:02 -07:00
2019-01-27 12:19:24 -08:00
// kit accessories
2021-06-10 13:15:52 -07:00
Route :: get ( 'accessories' ,
2019-01-27 12:19:24 -08:00
[
'as' => 'api.kits.accessories.index' ,
'uses' => 'PredefinedKitsController@indexAccessories' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: post ( 'accessories' ,
2019-01-27 12:19:24 -08:00
[
'as' => 'api.kits.accessories.store' ,
'uses' => 'PredefinedKitsController@storeAccessory' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: put ( 'accessories/{accessory_id}' ,
2019-01-27 12:19:24 -08:00
[
'as' => 'api.kits.accessories.update' ,
'uses' => 'PredefinedKitsController@updateAccessory' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: delete ( 'accessories/{accessory_id}' ,
2019-01-27 12:19:24 -08:00
[
'as' => 'api.kits.accessories.destroy' ,
'uses' => 'PredefinedKitsController@detachAccessory' ,
]
);
// kit consumables
2021-06-10 13:15:52 -07:00
Route :: get ( 'consumables' ,
2019-01-27 12:19:24 -08:00
[
'as' => 'api.kits.consumables.index' ,
'uses' => 'PredefinedKitsController@indexConsumables' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: post ( 'consumables' ,
2019-01-27 12:19:24 -08:00
[
'as' => 'api.kits.consumables.store' ,
'uses' => 'PredefinedKitsController@storeConsumable' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: put ( 'consumables/{consumable_id}' ,
2019-01-27 12:19:24 -08:00
[
'as' => 'api.kits.consumables.update' ,
'uses' => 'PredefinedKitsController@updateConsumable' ,
]
);
2021-06-10 13:15:52 -07:00
Route :: delete ( 'consumables/{consumable_id}' ,
2019-01-27 12:19:24 -08:00
[
'as' => 'api.kits.consumables.destroy' ,
'uses' => 'PredefinedKitsController@detachConsumable' ,
]
);
2019-08-14 22:33:56 -07:00
}); // kits group
2018-04-04 17:33:02 -07:00
2021-06-10 13:15:52 -07:00
Route :: fallback ( function () {
2020-12-08 21:05:01 -08:00
return response () -> json (
[
'status' => 'error' ,
'message' => '404 endpoint not found. Please check the API reference at https://snipe-it.readme.io/reference to find a valid API endpoint.' ,
'payload' => null ,
], 404 );
});
2017-02-23 16:32:35 -08:00
});