DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
snipe-it/app/Importer
History
snipe 5290c47e2a Merge branch 'develop' into v5-master-develop-integration 
# Conflicts:
#	.env.example
#	.travis.yml
#	Dockerfile
#	README.md
#	app/Console/Commands/LdapSync.php
#	app/Console/Kernel.php
#	app/Http/Controllers/AccessoriesController.php
#	app/Http/Controllers/Api/AccessoriesController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/CategoriesController.php
#	app/Http/Controllers/CompaniesController.php
#	app/Http/Controllers/ComponentsController.php
#	app/Http/Controllers/ConsumablesController.php
#	app/Http/Controllers/DepartmentsController.php
#	app/Http/Controllers/LicensesController.php
#	app/Http/Controllers/LocationsController.php
#	app/Http/Controllers/ManufacturersController.php
#	app/Http/Controllers/ReportsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Http/Controllers/SuppliersController.php
#	app/Http/Controllers/UsersController.php
#	app/Http/Middleware/EncryptCookies.php
#	app/Http/Requests/AssetRequest.php
#	app/Http/Transformers/AssetMaintenancesTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/AssetMaintenance.php
#	app/Models/Location.php
#	app/Models/User.php
#	composer.json
#	composer.lock
#	config/backup.php
#	config/database.php
#	config/version.php
#	public/mix-manifest.json
#	resources/lang/en-ID/general.php
#	resources/lang/vi/admin/settings/general.php
#	resources/views/accessories/edit.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/layouts/default.blade.php
#	tests/api/ApiCategoriesCest.php
2019-11-18 19:49:39 -08:00
..
AccessoryImporter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
AssetImporter.php Merge branch 'develop' into v5-master-develop-integration 2019-11-18 19:49:39 -08: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 'develop' into dev-master-integration 2019-02-13 06:42:52 -08:00
Importer.php Integrations/develop into master (#7352) 2019-08-14 21:48:14 -07:00
ItemImporter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
LicenseImporter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00
UserImporter.php Minor code cleanup bits and bobs (#6805) 2019-03-13 20:12:03 -07:00