Alex Janes a68ec8bb57 Update LoginController.php ... Updated if statements to match convention exactly.		2021-12-17 18:52:42 -05:00
..
Accessories	Merge remote-tracking branch 'origin/master' into develop	2021-10-20 17:26:41 -07:00
Account
Api	Small merge unmagling	2021-12-16 14:38:04 -08:00
Assets	Applied escaping fix from master to develop	2021-11-24 19:38:27 -08:00
Auth	Update LoginController.php	2021-12-17 18:52:42 -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
Licenses	Fixed duplicate use statement from merge fuckery	2021-10-20 17:54:32 -07:00
Users	Add a variable to better control the selected user's ids	2021-12-11 18:01:38 -06:00
ActionlogController.php
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	Adds reqestable as model bulk edit field	2021-10-28 15:15:54 -07:00
CategoriesController.php
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
Controller.php
CustomFieldsController.php	Small merge unmagling	2021-12-16 14:38:04 -08:00
CustomFieldsetsController.php
DashboardController.php
DepartmentsController.php
DepreciationsController.php	Merge branch 'develop-v6-integration' into develop-v6-rc1	2021-09-21 23:46:50 -07:00
GroupsController.php
HealthController.php
ImportsController.php
LocationsController.php
ManufacturersController.php
ModalController.php
ProfileController.php
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
SuppliersController.php
ViewAssetsController.php