slong753 17ccfa9ada resolve some conflicts

2023-09-11 17:15:24 -05:00

..

Accessories

Fixed #13562 - allow inline view for uploaded files

2023-09-05 18:28:01 +01:00

Account

Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error

2023-08-22 15:49:56 +01:00

Api

Merge branch 'develop' into asset-model-notifs

2023-09-11 09:37:22 -07:00

Assets

resolve some conflicts

2023-09-11 17:15:24 -05:00

Auth

…

Components

Fixed #13562 - allow inline view for uploaded files

2023-09-05 18:28:01 +01:00

Consumables

Fixed #13562 - allow inline view for uploaded files

2023-09-05 18:28:01 +01:00

Kits

…

Licenses

Fixed #13562 - allow inline view for uploaded files

2023-09-05 18:28:01 +01:00

Users

Update to only use relative paths

2023-09-07 20:22:14 +01:00

ActionlogController.php

…

AssetMaintenancesController.php

…

AssetModelsController.php

progress

2023-09-11 17:10:41 -05:00

AssetModelsFilesController.php

Fixed #13562 - allow inline view for uploaded files

2023-09-05 18:28:01 +01:00

BulkAssetModelsController.php

…

CategoriesController.php

…

CheckInOutRequest.php

…

CompaniesController.php

Update CompaniesController.php

2023-08-13 17:18:25 +02:00

Controller.php

…

CustomFieldsController.php

Added ability to show/hide custom fields in list views by default

2023-07-14 09:09:43 +01:00

CustomFieldsetsController.php

Fixed #13450 - remove escaping on saveing new custom fields

2023-08-14 22:21:41 +01:00

DashboardController.php

…

DepartmentsController.php

…

DepreciationsController.php

…

GoogleAuthController.php

…

GroupsController.php

…

HealthController.php

…

LabelsController.php

Changed example asset name

2023-08-18 22:17:54 +01:00

LocationsController.php

…

ManufacturersController.php

…

ModalController.php

…

ProfileController.php

…

ReportsController.php

Filter unaccepted assets that are not assigned to users

2023-09-07 13:39:16 -06:00

SettingsController.php

Added name order to settings save controller method

2023-08-21 20:10:03 +01:00

StatuslabelsController.php

…

SuppliersController.php

…

ViewAssetsController.php

…