snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php		2022-03-03 21:59:38 -08:00
..
Accessories	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Account	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Api	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Assets	Merge pull request #10455 from adagioajanes/features/quickscan_checkin	2022-02-01 20:19:45 -08:00
Auth	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Components	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Consumables	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Kits	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
Licenses	Fixed #7824	2022-01-10 14:03:28 -05:00
Users	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
ActionlogController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
AssetMaintenancesController.php	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
AssetModelsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
BulkAssetModelsController.php	Merge master into develop	2022-01-12 20:51:33 -08:00
CategoriesController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CheckInOutRequest.php	when parent asset is assigned to other location, children assets location are updated as well.	2021-10-20 17:01:25 -07:00
CompaniesController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Controller.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CustomFieldsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
CustomFieldsetsController.php	Merge master into develop	2022-01-12 20:51:33 -08:00
DashboardController.php	Added additional boxes to the dashboard	2021-06-28 16:36:15 -07:00
DepartmentsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
DepreciationsController.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
GroupsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
HealthController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ImportsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
LocationsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ManufacturersController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ModalController.php	Merge master into develop	2022-01-12 20:51:33 -08:00
ProfileController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
ReportsController.php	Add title column to custom reports	2021-12-14 12:05:33 -06:00
SettingsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
StatuslabelsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SuppliersController.php	Added gate to supplier	2022-02-13 11:58:12 -07:00
ViewAssetsController.php	Revert the unnecessary optimization for asset->count()	2022-01-13 19:37:08 -08:00