Spencer Long cdb1140f10 Merge branch 'develop' into bug/sc-24884

2024-05-23 13:53:00 -05:00

..

Accessories

Fixes file upload XSS vulnerability [sc-24156]

2024-02-08 14:30:40 +00:00

Account

adds note to log listener and checkout accept notif

2024-04-03 11:59:47 -07:00

Api

Merge branch 'develop' into bug/sc-24884

2024-05-23 13:53:00 -05:00

Assets

Set file name variable

2024-05-16 19:56:58 +01:00

Auth

Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute

2024-01-25 19:53:24 +00:00

Components

Fixes file upload XSS vulnerability [sc-24156]

2024-02-08 14:30:40 +00:00

Consumables

Fixes file upload XSS vulnerability [sc-24156]

2024-02-08 14:30:40 +00:00

Kits

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

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

Licenses

Handle potentially deleted admin users in license export

2024-05-23 08:39:15 +01:00

Users

Fiddled with storage facade a little more

2024-05-22 17:44:49 +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

Check that the asset is not deleted

2024-02-14 10:14:25 +00:00

AssetModelsController.php

Merge pull request #14369 from spencerrlongg/bug/sc-24343

2024-03-26 19:22:29 +00:00

AssetModelsFilesController.php

Removed more debugging

2024-05-16 15:16:52 +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

get rid of e() on store and update

2024-01-26 11:56:02 -06: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

Added created_by to groups table

2024-02-28 08:15:59 +00:00

HealthController.php

Adopt Laravel coding style

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

LabelsController.php

Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels

2024-04-23 13:31:38 +01:00

LocationsController.php

add withCount to query instead

2024-03-19 15:18:18 -07:00

ManufacturersController.php

Changed verb to “restore” from “restored”

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

ModalController.php

Fixed visibility for constants and methods

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

ProfileController.php

Translated account save message

2024-05-20 11:19:31 +01:00

ReportsController.php

Fixed ambiguous id clause in custom report

2024-04-04 14:23:58 +01:00

SettingsController.php

Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels

2024-04-23 13:31:38 +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