DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
snipe-it/app/Http/Transformers
History
snipe f2f8f96991 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Transformers/AssetsTransformer.php
#	app/Importer/ConsumableImporter.php
#	app/Models/Consumable.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/custom_fields/fieldsets/view.blade.php
#	resources/views/layouts/default.blade.php
#	routes/web.php
#	routes/web/fields.php
2021-11-15 19:24:38 -08:00
..
AccessoriesTransformer.php Adopt Laravel coding style 2021-06-10 20:15:52 +00:00
ActionlogsTransformer.php Use Helper alias 2021-09-28 19:44:55 -07: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 remote-tracking branch 'origin/master' into develop 2021-11-15 19:24:38 -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 Adopt Laravel coding style 2021-06-10 20:15:52 +00: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 2021-10-20 17:26:41 -07: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