snipe-it/app/Http/Controllers
snipe 407445456a Merge branch 'features/6204_email_audit-alerts' into develop
# Conflicts:
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/LicensesController.php
#	composer.json
#	composer.lock
#	config/version.php
#	resources/views/auth/two_factor_enroll.blade.php
2019-05-06 08:45:13 -04:00
..
Accessories Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Account Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Api Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
Assets Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
Auth Fix usage of Google2FA Facade (#6864) 2019-03-27 22:01:38 -07:00
Components Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Consumables Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Kits Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Licenses Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
Users Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ActionlogController.php Discussion: Moving to policies for controller based authorization (#3080) 2016-12-19 11:04:28 -08:00
AssetMaintenancesController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
AssetModelsController.php Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
BulkAssetModelsController.php Change $request->has to $request->filled unilaterally 2018-07-24 22:51:31 -07:00
CategoriesController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
CheckInOutRequest.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
CompaniesController.php Update CompaniesController.php (#6900) 2019-05-05 20:57:28 -04:00
Controller.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
CustomFieldsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
CustomFieldsetsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
DashboardController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
DepartmentsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
DepreciationsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
GroupsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ImportsController.php Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
LocationsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ManufacturersController.php Merge branch 'hotfixes/2fa_qr' into develop 2019-03-20 02:17:02 -07:00
ModalController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ProfileController.php Merge branch 'features/6204_email_audit-alerts' into develop 2019-05-06 08:45:13 -04:00
ReportsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
SettingsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
StatuslabelsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
SuppliersController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ViewAssetsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00