Brady Wetherington 4dda28de9e WIP: cleaning up LDAP

2021-10-28 18:19:50 -07:00

..

AccessoriesController.php

Merge branch 'develop-v6-integration' into develop-v6-rc1

2021-09-21 23:46:50 -07:00

AssetMaintenancesController.php

Merge remote-tracking branch 'origin/master' into develop

2021-10-20 17:26:41 -07:00

AssetModelsController.php

Merge remote-tracking branch 'origin/master' into develop

2021-10-20 17:26:41 -07:00

AssetsController.php

Merge remote-tracking branch 'origin/master' into develop

2021-10-20 17:26:41 -07:00

CategoriesController.php

Merge branch 'develop-v6-integration' into develop-v6-rc1

2021-09-21 23:46:50 -07:00

CompaniesController.php

…

ComponentsController.php

Merge remote-tracking branch 'origin/master' into develop

2021-10-20 17:26:41 -07:00

ConsumablesController.php

Merge branch 'develop-v6-integration' into develop-v6-rc1

2021-09-21 23:46:50 -07:00

CustomFieldsController.php

…

CustomFieldsetsController.php

…

DepartmentsController.php

…

DepreciationsController.php

…

GroupsController.php

…

ImportController.php

…

LicensesController.php

Merge branch 'develop' into api-licenses

2021-09-27 15:02:51 -04:00

LicenseSeatsController.php

…

LocationsController.php

Small conflict handling bits

2021-09-22 00:00:44 -07:00

ManufacturersController.php

…

PredefinedKitsController.php

…

ProfileController.php

…

ReportsController.php

…

SettingsController.php

WIP: cleaning up LDAP

2021-10-28 18:19:50 -07:00

StatuslabelsController.php

Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable

2021-09-26 13:41:52 -07:00

SuppliersController.php

Merge branch 'develop-v6-integration' into develop-v6-rc1

2021-09-21 23:46:50 -07:00

UsersController.php

Merge remote-tracking branch 'origin/master' into develop

2021-10-20 17:26:41 -07:00