snipe ef1eb15a91 Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/permissions.php		2022-05-12 09:31:42 -07:00
..
Accessories	Merge remote-tracking branch 'origin/master' into develop	2022-03-03 21:59:38 -08:00
Account	clean up	2022-03-22 10:07:08 -07:00
Api	Merge remote-tracking branch 'origin/master' into develop	2022-05-10 17:26:26 -07:00
Assets	Fixed route name	2022-05-06 15:46:25 -07:00
Auth	Merge remote-tracking branch 'origin/master' into develop	2022-05-10 17:26:26 -07: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	Merge remote-tracking branch 'origin/master' into develop	2022-05-12 09:31:42 -07:00
Licenses	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
Users	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8	2022-04-28 17:49:06 +01:00
ActionlogController.php	Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf	2022-03-22 10:10:56 -07: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
CategoriesController.php
CheckInOutRequest.php
CompaniesController.php
Controller.php
CustomFieldsController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-20 13:29:12 -08:00
CustomFieldsetsController.php	Adds an integer casting to the order input field so it cannot be null	2022-05-01 15:27:05 -05:00
DashboardController.php
DepartmentsController.php
DepreciationsController.php
GroupsController.php
HealthController.php
ImportsController.php
LocationsController.php
ManufacturersController.php
ModalController.php
ProfileController.php
ReportsController.php	Evaluate if an item still exists before trying to get its name in the report	2022-05-01 13:25:55 -05:00
SettingsController.php	Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync	2022-03-29 12:06:01 +01:00
StatuslabelsController.php
SuppliersController.php
ViewAssetsController.php