snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' ...

Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json

2024-06-17 11:18:33 +01:00

..

AccessoriesController.php

Fixes path for redirect response

2024-05-29 18:01:40 +01:00

AssetFilesController.php

Fix an error message

2024-05-29 22:32:45 +01:00

AssetMaintenancesController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

AssetModelsController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

AssetsController.php

Updated/removed facades

2024-05-29 12:53:51 +01:00

CategoriesController.php

Use singleton for offset

2023-10-16 23:23:43 +01:00

CompaniesController.php

Fix company asset counts for dashboard widget

2024-02-05 15:55:53 +00:00

ComponentsController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

ConsumablesController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

CustomFieldsController.php

Fixes path for redirect response

2024-05-29 18:01:40 +01:00

CustomFieldsetsController.php

Fixes path for redirect response

2024-05-29 18:01:40 +01:00

DepartmentsController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

DepreciationsController.php

Use singleton for offset

2023-10-16 23:23:43 +01:00

GroupsController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

ImportController.php

Use artisan facade

2024-05-29 12:40:05 +01:00

LabelsController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

LicensesController.php

Allow sorting on min_amt

2024-02-28 11:05:13 +00:00

LicenseSeatsController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

LocationsController.php

Fixed translation string

2024-06-03 16:40:52 +01:00

ManufacturersController.php

Changed verb to “restore” from “restored”

2023-11-22 20:08:41 +00:00

PredefinedKitsController.php

Use singleton for offset

2023-10-16 23:23:43 +01:00

ProfileController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

ReportsController.php

Re-use total to avoid duplicate count

2024-05-28 18:01:47 +01:00

SettingsController.php

Cleaned up facade names and references

2024-05-29 12:38:15 +01:00

StatuslabelsController.php

Use singleton for offset

2023-10-16 23:23:43 +01:00

SuppliersController.php

Use singleton for offset

2023-10-16 23:23:43 +01:00

UsersController.php

Merge remote-tracking branch 'origin/develop'

2024-06-17 11:18:33 +01:00