DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 13:57:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
snipe-it/app/Http/Controllers/Api
History
snipe aa8f1378c9 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	README.md
#	app/Http/Controllers/Accessories/AccessoriesController.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/UsersController.php
#	app/Http/Controllers/AssetMaintenancesController.php
#	app/Http/Controllers/Assets/AssetFilesController.php
#	app/Http/Controllers/Assets/AssetsController.php
#	app/Http/Controllers/Assets/BulkAssetsController.php
#	app/Http/Controllers/Components/ComponentsController.php
#	app/Http/Controllers/Consumables/ConsumablesController.php
#	app/Http/Controllers/Licenses/LicenseFilesController.php
#	app/Http/Controllers/Licenses/LicensesController.php
#	app/Http/Controllers/Users/UserFilesController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Http/Transformers/LicensesTransformer.php
#	app/Importer/UserImporter.php
#	app/Models/Asset.php
#	config/app.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/lang/en/admin/users/message.php
#	resources/lang/is/button.php
#	resources/lang/ja/admin/kits/general.php
#	resources/lang/ro/admin/users/general.php
#	resources/lang/zh-HK/admin/depreciations/general.php
#	resources/lang/zh-HK/admin/models/general.php
#	resources/views/hardware/qr-view.blade.php
#	resources/views/hardware/view.blade.php
#	resources/views/partials/bootstrap-table.blade.php
#	resources/views/users/view.blade.php
#	routes/web.php
#	routes/web/hardware.php
#	routes/web/models.php
#	routes/web/users.php
2021-10-20 17:26:41 -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 Support images and multipart requests 2021-07-15 12:26:13 +03:00
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 Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
CustomFieldsetsController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
DepartmentsController.php Fixed case again 2021-07-15 12:26:14 +03:00
DepreciationsController.php adds a Floor value for depreciation models 2021-08-16 18:14:10 -07:00
GroupsController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
ImportController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
LicensesController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
LicenseSeatsController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
LocationsController.php Small conflict handling bits 2021-09-22 00:00:44 -07:00
ManufacturersController.php Support images and multipart requests 2021-07-15 12:26:13 +03:00
PredefinedKitsController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
ProfileController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
ReportsController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
SettingsController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00: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