snipe-it/app/Http/Controllers/Api
snipe 9f3a8a43cc Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	composer.lock
2021-03-17 19:41:02 -07:00
..
AccessoriesController.php Started migration to normalize note 2020-10-22 23:18:14 -07:00
AssetMaintenancesController.php Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
AssetModelsController.php Fixed #9085 - asset models not showing proper pagination 2021-02-25 16:43:38 -08:00
AssetsController.php Depreciation detail view fixes [ch15776] (#9059) 2021-01-27 17:44:05 -08:00
CategoriesController.php Clean up Transformers and extract an isDeletable() method to models where it makes sense. 2020-05-23 15:24:10 -04:00
CompaniesController.php Clean up Transformers and extract an isDeletable() method to models where it makes sense. 2020-05-23 15:24:10 -04:00
ComponentsController.php Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
ConsumablesController.php Fixed [ch15085] - duplicate use statements in Consumables controller 2020-09-03 19:47:15 -07:00
CustomFieldsController.php Fixed #7250 - permission issue for API fieldsets and fields endpoints 2019-07-24 11:00:42 -07:00
CustomFieldsetsController.php Fixed #7250 - permission issue for API fieldsets and fields endpoints 2019-07-24 11:00:42 -07:00
DepartmentsController.php Removed duplicate update method (per #7997) 2020-04-30 17:23:56 -07:00
DepreciationsController.php Depreciation detail view fixes [ch15776] (#9059) 2021-01-27 17:44:05 -08:00
GroupsController.php Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
ImportController.php Apply PR #8043 to develop 2020-05-11 22:57:55 -07:00
LicensesController.php Depreciation detail view fixes [ch15776] (#9059) 2021-01-27 17:44:05 -08:00
LocationsController.php Fixes ternary that sets the offset in 0 when the offset passed to the API for the user is greater than total locations. (#9210) 2021-02-26 12:56:04 -08:00
ManufacturersController.php Clean up Transformers and extract an isDeletable() method to models where it makes sense. 2020-05-23 15:24:10 -04:00
PredefinedKitsController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ProfileController.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
ReportsController.php Fixed signature issue on accepted assets - related to #8577 2020-10-22 23:20:55 -07:00
SettingsController.php Changed debug level on bad LDAP connection (#9314) 2021-03-17 19:24:28 -07:00
StatuslabelsController.php Fixed #9266 - set a colors_array variable even if other conditions are not met 2021-03-09 21:04:32 -08:00
SuppliersController.php Merge branch 'develop' into integrations/2020-04-15-v5-merge 2020-04-20 23:20:34 -07:00
UsersController.php Modified how we do Select2 dynamic drop-down menus to be more secure (#9079) 2021-02-02 15:55:21 -08:00