ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
bca82684a1b8cc5a19fcd86cb260ca08d3b5a812
snipe-it/app/Http/Controllers
History
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
..
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 'hotfixes/2fa_qr' into develop
2019-03-20 02:17:02 -07:00
Assets
Merge branch 'hotfixes/2fa_qr' into develop
2019-03-20 02:17:02 -07:00
Auth
Merge branch 'hotfixes/2fa_qr' into develop
2019-03-20 02:17:02 -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
Minor code cleanup bits and bobs (#6805)
2019-03-13 20:12:03 -07: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
Minor code cleanup bits and bobs (#6805)
2019-03-13 20:12:03 -07: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