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
..
AccessoryImporter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
AssetImporter.php	Merge branch 'develop' into integrations/2020-04-15-v5-merge	2020-04-20 23:20:34 -07:00
ComponentImporter.php	Hotfix: Disabling the event dispatcher broke model validation. (#4912)	2018-01-25 10:10:56 -08:00
ConsumableImporter.php	Minor code cleanup bits and bobs (#6805)	2019-03-13 20:12:03 -07:00
import_mappings.md	Merge branch 'master' into integrations/2020-08-31-v5-rc	2020-08-31 12:14:44 -07:00
Importer.php	Merge branch 'master' into integrations/2020-08-31-v5-rc	2020-08-31 12:14:44 -07:00
ItemImporter.php	Save User ID when checking out a license. Also buff up importing tests to confirm license can be checked out.	2020-05-12 14:38:20 -04:00
LicenseImporter.php	Save User ID when checking out a license. Also buff up importing tests to confirm license can be checked out.	2020-05-12 14:38:20 -04:00
UserImporter.php	Merge branch 'master' into integrations/2020-08-31-v5-rc	2020-08-31 12:14:44 -07:00