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
..
AccessoryPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ActionlogPresenter.php	Fixed #4300 - Fix for illegal character type in action log	2018-01-20 00:27:45 -08:00
AssetMaintenancesPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetModelPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetPresenter.php	De-normalize new counters from 4.3.0 (#5547)	2018-05-16 19:20:43 -07:00
CategoryPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
CompanyPresenter.php	Improvement - make asset, etc totals in company listing sortable	2017-12-12 07:03:09 -08:00
ComponentPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ConsumablePresenter.php	Fixed #4557 - added missing fields in components/consumables list view	2017-12-05 00:40:30 -08:00
DepreciationPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
LicensePresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
LicenseSeatPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
LocationPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
ManufacturerPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
PredefinedKitPresenter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
Presentable.php	Add presenters for models. (#3098)	2016-12-23 17:52:00 -08:00
Presenter.php	Fix asset create (#3929)	2017-09-06 16:24:43 -07:00
UserPresenter.php	Merge branch 'hotfixes/2fa_qr' into develop	2019-03-20 02:17:02 -07:00