snipe e321aeabae Merge branch 'master' into integrations/2020-08-31-v5-rc ... # Conflicts: # .all-contributorsrc # .nvmrc # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/ImportController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/UsersController.php # app/Importer/import_mappings.md # app/Models/Ldap.php # app/Models/Loggable.php # composer.json # composer.lock # config/version.php # public/css/build/all.css # public/css/dist/all.css # public/css/skins/skin-contrast.css # public/css/skins/skin-contrast.css.map # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/importer/importer-file.vue # resources/assets/less/overrides.less # resources/macros/macros.php # resources/views/custom_fields/fieldsets/view.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/labels.blade.php # resources/views/hardware/view.blade.php # resources/views/layouts/default.blade.php # resources/views/modals/model.blade.php # resources/views/modals/user.blade.php # resources/views/users/index.blade.php # routes/api.php # routes/web/fields.php # tests/unit/UserTest.php		2020-08-31 12:14:44 -07:00
..
AccessoriesController.php	Merge branch 'develop' into integrations/2020-04-15-v5-merge	2020-04-20 23:20:34 -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 assetmodels selectlist	2020-08-26 02:32:39 -07:00
AssetsController.php	Merge branch 'master' into integrations/2020-08-31-v5-rc	2020-08-31 12:14:44 -07: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	Merge branch 'master' into integrations/2020-08-31-v5-rc	2020-08-31 12:14:44 -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	Merge branch 'develop' into integrations/2020-04-15-v5-merge	2020-04-20 23:20:34 -07: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	Assorted licenses UI fixes while testing.	2020-05-12 14:38:21 -04:00
LocationsController.php	Clean up Transformers and extract an isDeletable() method to models where it makes sense.	2020-05-23 15:24:10 -04: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	Change ->has() to ->filled()	2019-05-23 17:39:50 -07:00
SettingsController.php	Added debugging logs	2020-04-23 22:46:02 -07:00
StatuslabelsController.php	Added assignedTo scope	2020-08-25 20:37:30 -07:00
SuppliersController.php	Merge branch 'develop' into integrations/2020-04-15-v5-merge	2020-04-20 23:20:34 -07:00
UsersController.php	Merge branch 'master' into integrations/2020-08-31-v5-rc	2020-08-31 12:14:44 -07:00