Cram42 6b2fe582ca Merge branch 'feature-label2' into develop

2022-11-01 20:12:28 +08:00

..

AccessoriesController.php

Removed duplicated $allowed_columns

2022-06-14 15:06:04 -07:00

AssetMaintenancesController.php

Additional filters on maintenances UI

2022-06-14 16:10:48 -07:00

AssetModelsController.php

Correctly filter by category_id

2022-06-13 20:42:21 -07:00

AssetsController.php

Aplpies current time to checkin date

2022-07-21 21:45:25 -07:00

CategoriesController.php

Added additional filters for api indexes

2022-06-28 19:59:45 -07:00

CompaniesController.php

Added additional filters for api indexes

2022-06-28 19:59:45 -07:00

ComponentsController.php

Added note on checkout

2022-08-10 15:04:59 -07:00

ConsumablesController.php

Added notes to user consumables tab

2022-08-10 15:34:07 -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

Added additional filters for api indexes

2022-06-28 19:59:45 -07:00

DepreciationsController.php

adds a Floor value for depreciation models

2021-08-16 18:14:10 -07:00

GroupsController.php

Added additional filters for api indexes

2022-06-28 19:59:45 -07:00

ImportController.php

Add an early return if for some reason the import record is not found

2022-05-18 06:15:46 -05:00

LabelsController.php

Implement API for labels

2022-11-01 19:57:51 +08:00

LicensesController.php

Removed duplicate supplier_id

2022-07-13 13:08:15 -07:00

LicenseSeatsController.php

Correct comparison logic

2022-10-08 12:54:15 +07:00

LocationsController.php

Renamed column back to assets_count for legacy

2022-10-26 09:39:03 -07:00

ManufacturersController.php

Added additional filters for api indexes

2022-06-28 19:59:45 -07:00

PredefinedKitsController.php

Merge master into develop

2022-01-12 20:51:33 -08:00

ProfileController.php

Formatted show api

2022-06-28 23:23:55 -07:00

ReportsController.php

Added relations to report search

2022-08-02 23:50:10 -07:00

SettingsController.php

Attempt a download via API

2022-06-28 23:59:13 -07:00

StatuslabelsController.php

Fixed #11521 - switch to using status meta from status label name

2022-09-29 03:48:58 -07:00

SuppliersController.php

Added additional filters for api indexes

2022-06-28 19:59:45 -07:00

UsersController.php

Added start/end to sortable columns

2022-10-05 17:07:07 -07:00