snipe a937bd34f6 Merge master back down into develop ... Signed-off-by: snipe <snipe@snipe.net>		2022-03-29 16:28:43 +01: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 master back down into develop	2022-03-29 16:28:43 +01:00
Assets	Update in the license seat the user that the asset with that license have assigned	2022-03-21 15:06:43 -06: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
Licenses
Users	Merge pull request #10776 from snipe/added_trim_to_email_and_username	2022-03-04 11:57:33 -08: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
DashboardController.php
DepartmentsController.php
DepreciationsController.php
GroupsController.php
HealthController.php
ImportsController.php
LocationsController.php
ManufacturersController.php
ModalController.php
ProfileController.php	Merge remote-tracking branch 'origin/master' into develop	2022-02-01 18:53:05 -08:00
ReportsController.php	fix showDeletedFunction by reverting #9508	2022-03-16 20:20:46 +01: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	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