DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 08:17:48 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
snipe-it/app/Http/Controllers/Api
History
snipe b876d0abb0 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.env.example
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Kernel.php
#	app/Http/Transformers/ActionlogsTransformer.php
#	app/Importer/AssetImporter.php
#	app/Models/Accessory.php
#	app/Models/Consumable.php
#	app/Presenters/AccessoryPresenter.php
#	app/Presenters/ComponentPresenter.php
#	app/Presenters/ConsumablePresenter.php
#	app/Providers/AuthServiceProvider.php
#	composer.json
#	composer.lock
#	config/app.php
#	config/cors.php
#	config/version.php
#	package-lock.json
#	public/js/build/app.js
#	public/js/build/app.js.LICENSE.txt
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/accessories/view.blade.php
#	resources/views/consumables/view.blade.php
#	resources/views/settings/saml.blade.php
#	routes/api.php
2022-03-03 21:59:38 -08:00
..
AccessoriesController.php Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
AssetMaintenancesController.php Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
AssetModelsController.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
AssetsController.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
CategoriesController.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
CompaniesController.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
ComponentsController.php Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00
ConsumablesController.php Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08: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 Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08: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 Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
LicenseSeatsController.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
LocationsController.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
ManufacturersController.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
PredefinedKitsController.php Merge master into develop 2022-01-12 20:51:33 -08: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 Ahem. 2022-02-10 22:43:51 -08:00
StatuslabelsController.php Set default_label to 0 instead of null in API 2021-10-25 20:14:01 -07:00
SuppliersController.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
UsersController.php Merge remote-tracking branch 'origin/master' into develop 2022-03-03 21:59:38 -08:00