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
..
Accessories	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
Account	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
Api	Merge master into develop	2022-01-12 20:51:33 -08:00
Assets	Applied escaping fix from master to develop	2021-11-24 19:38:27 -08:00
Auth	Merge branch 'develop' into features/lock_logins_to_saml	2022-01-11 09:05:14 -05:00
Components	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
Consumables	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07: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 pull request #10264 from nuraeil/added-localized-strings	2022-01-10 14:48:52 -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	2021-10-20 17:26:41 -07:00
AssetModelsController.php	Merge master down into develop	2021-12-16 14:26:24 -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 master into develop	2022-01-12 20:51:33 -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	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ReportsController.php	Add title column to custom reports	2021-12-14 12:05:33 -06:00
SettingsController.php	Small merge unmagling	2021-12-16 14:38:04 -08:00
StatuslabelsController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
SuppliersController.php	Adopt Laravel coding style	2021-06-10 20:15:52 +00:00
ViewAssetsController.php	Merge master into develop	2022-01-12 20:51:33 -08:00