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
..
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-11-15 19:24:38 -08: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	Merge branch 'develop' into fixes/fmcs_departments	2021-10-28 18:18:08 -07: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 branch 'develop' into api-licenses	2021-09-27 15:02:51 -04: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	Set default_label to 0 instead of null in API	2021-10-25 20:14:01 -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