DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
snipe-it/app/Http/Transformers
History
snipe dd5f812d88 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.all-contributorsrc
#	README.md
#	app/Console/Commands/FixDoubleEscape.php
#	app/Console/Commands/LdapSync.php
#	app/Exceptions/Handler.php
#	app/Http/Controllers/Api/AssetMaintenancesController.php
#	app/Http/Controllers/Api/AssetModelsController.php
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Api/CategoriesController.php
#	app/Http/Controllers/Api/CompaniesController.php
#	app/Http/Controllers/Api/DepartmentsController.php
#	app/Http/Controllers/Api/LicensesController.php
#	app/Http/Controllers/Api/LocationsController.php
#	app/Http/Controllers/Api/ManufacturersController.php
#	app/Http/Controllers/Api/SettingsController.php
#	app/Http/Controllers/Api/SuppliersController.php
#	app/Http/Controllers/AssetModelsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	app/Http/Controllers/CustomFieldsController.php
#	app/Http/Controllers/SettingsController.php
#	app/Models/Loggable.php
#	app/Providers/AuthServiceProvider.php
#	config/version.php
#	database/migrations/2014_11_04_231416_update_group_field_for_reporting.php
#	database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php
#	package-lock.json
#	package.json
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/assets/js/components/forms/asset-models/fieldset-default-values.vue
#	resources/views/hardware/view.blade.php
2022-02-20 13:29:12 -08:00
..
AccessoriesTransformer.php Merge master down into develop 2021-12-16 14:26:24 -08:00
ActionlogsTransformer.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
AssetMaintenancesTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
AssetModelsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
AssetsTransformer.php Merge master down into develop 2021-12-16 14:26:24 -08:00
CategoriesTransformer.php Merge branch 'develop-v6-integration' into develop-v6-rc1 2021-09-21 23:46:50 -07:00
CompaniesTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
ComponentsAssetsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
ComponentsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
ConsumablesTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
CustomFieldsetsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
CustomFieldsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
DatatablesTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
DepartmentsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
DepreciationReportTransformer.php Use Helper alias 2021-09-28 19:44:55 -07:00
DepreciationsTransformer.php Merge branch 'develop-v6-integration' into develop-v6-rc1 2021-09-21 23:46:50 -07:00
GroupsTransformer.php Merge master into develop 2022-01-12 20:51:33 -08:00
ImportsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
LicenseSeatsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
LicensesTransformer.php Merge remote-tracking branch 'origin/master' into develop 2022-02-20 13:29:12 -08:00
LocationsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
LoginAttemptsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
ManufacturersTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
PredefinedKitsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
SelectlistTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
StatuslabelsTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
SuppliersTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
UsersTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00