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

Merge pull request #12188 from snipe/fixes/decrease_logging_for_saml_when_not_enabled

2022-12-15 11:26:49 -08:00

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

Merge remote-tracking branch 'origin/master' into develop

2022-05-12 09:31:42 -07:00

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

Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf

2022-03-22 10:10:56 -07:00

AssetMaintenancesController.php

Fix #8208, #8896, #8985, #9789

2023-03-29 09:56:34 +02:00

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

Updated contrller to use trans_choice

2023-04-03 18:55:09 -07:00

CategoriesController.php

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

CheckInOutRequest.php

when parent asset is assigned to other location, children assets location are updated as well.

2021-10-20 17:01:25 -07:00

CompaniesController.php

Update CompaniesController.php

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

Controller.php

Updated support URL

2023-04-05 14:54:40 -07:00

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

Calculate the proper amount of people in the dashboard if Full Company Support is enabled

2022-12-20 18:39:17 -06:00

DepartmentsController.php

Added phone, fax to departments, locations, companies

2023-07-10 19:44:21 +01:00

DepreciationsController.php

Merge branch 'develop-v6-integration' into develop-v6-rc1

2021-09-21 23:46:50 -07:00

GoogleAuthController.php

Extra debugging

2023-05-10 09:10:53 -07:00

GroupsController.php

Use corrected language string

2023-03-28 16:39:52 -07:00

HealthController.php

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

LabelsController.php

Changed example asset name

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

LocationsController.php

Added phone, fax to departments, locations, companies

2023-07-10 19:44:21 +01:00

ManufacturersController.php

Added dynamic warranty URL to manufacturers

2023-04-26 16:39:15 -07:00

ModalController.php

Fixed visibility for constants and methods

2023-02-06 12:44:02 -08:00

ProfileController.php

Updates the Gate “use” statement to be more specific

2023-03-18 11:58:09 -07:00

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

Adopt Laravel coding style

2021-06-10 20:15:52 +00:00

SuppliersController.php

Added gate to supplier

2022-02-13 11:58:12 -07:00

ViewAssetsController.php

Adds ternary to set a quantity when needed

2023-06-27 18:37:22 -06:00