snipe bca82684a1 Merge branch 'hotfixes/2fa_qr' into develop ... # Conflicts: # .all-contributorsrc # Dockerfile # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/ImportsController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SuppliersController.php # app/Http/Requests/ItemImportRequest.php # app/Http/Transformers/ActionlogsTransformer.php # composer.json # composer.lock # config/app.php # config/version.php # docker/startup.sh # public/css/build/all.css # public/css/dist/all.css # 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		2019-03-20 02:17:02 -07:00
..
.gitkeep	Version 3 - hold onto your butts	2016-03-25 01:18:05 -07:00
AccessoryPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetModelPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CategoryPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CheckoutablePermissionsPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CompanyPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ComponentPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ConsumablePolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CustomFieldPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CustomFieldsetPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
DepartmentPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
DepreciationPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
LicensePolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
LocationPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ManufacturerPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
SnipePermissionsPolicy.php	Fixes/import permissions mask (#6826)	2019-03-18 11:58:08 -07:00
StatuslabelPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
SupplierPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
UserPolicy.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00