snipe 43c57c8461 Merge master into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Http/Controllers/BulkAssetModelsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ModalController.php # app/Http/Transformers/GroupsTransformer.php # config/version.php # package-lock.json # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/less/overrides.less # resources/lang/en/admin/hardware/message.php # resources/lang/en/admin/settings/general.php # resources/views/partials/bootstrap-table.blade.php # routes/web.php		2022-01-12 20:51:33 -08:00
..
AccessoriesController.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
AssetMaintenancesController.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
AssetModelsController.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
AssetsController.php	Merge master down into develop	2021-12-16 14:26:24 -08:00
CategoriesController.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
CompaniesController.php	Support images and multipart requests	2021-07-15 12:26:13 +03:00
ComponentsController.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
ConsumablesController.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
CustomFieldsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
CustomFieldsetsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
DepartmentsController.php	Merge branch 'develop' into fixes/fmcs_departments	2021-10-28 18:18:08 -07:00
DepreciationsController.php	adds a Floor value for depreciation models	2021-08-16 18:14:10 -07:00
GroupsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ImportController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
LicensesController.php	Fixed #7824	2022-01-10 14:03:28 -05:00
LicenseSeatsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
LocationsController.php	Small conflict handling bits	2021-09-22 00:00:44 -07:00
ManufacturersController.php	Support images and multipart requests	2021-07-15 12:26:13 +03:00
PredefinedKitsController.php	Merge master into develop	2022-01-12 20:51:33 -08:00
ProfileController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ReportsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SettingsController.php	Some duplicate imports at the top of the Settings file	2022-01-03 13:53:53 -08:00
StatuslabelsController.php	Set default_label to 0 instead of null in API	2021-10-25 20:14:01 -07:00
SuppliersController.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
UsersController.php	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00