akemidx 537aa04c9a Merge branch 'develop' into delete_asset_from_view_page

2023-05-10 09:30:54 -04:00

..

Accessories

Merge pull request #12756 from dboth/develop

2023-04-25 22:32:13 -07:00

Account

Merge pull request #12972 from marcusmoore/bug/sc-23177

2023-05-08 13:04:37 -07:00

Api

Pass filename to pre-import backup

2023-05-08 14:48:26 -07:00

Assets

push for testing

2023-04-27 18:58:59 -04: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

Merge pull request #12756 from dboth/develop

2023-04-25 22:32:13 -07:00

Consumables

Merge pull request #12756 from dboth/develop

2023-04-25 22:32:13 -07:00

Kits

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

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

Licenses

Merge pull request #12756 from dboth/develop

2023-04-25 22:32:13 -07:00

Users

Ensure users editing themselves do not deactivate their account

2023-04-20 21:59:55 -07: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

Fixed #12724 - fieldset not saving on model

2023-03-24 06:11:24 -07:00

AssetModelsFilesController.php

Use new upload string

2022-11-03 13:57:50 -07: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

Adopt Laravel coding style

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

Controller.php

Updated support URL

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

CustomFieldsController.php

Unmix return type variables

2023-05-03 10:57:02 -07:00

CustomFieldsetsController.php

Added fieldset sync

2023-04-25 21:29:57 -07: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

allows company and location ids to be null

2022-08-11 12:47:40 -07:00

DepreciationsController.php

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

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

GoogleAuthController.php

Hide client secret if app is locked

2023-05-10 02:22:49 -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

LocationsController.php

Remove name from blanking paroperties

2023-03-01 14:12:33 -08: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

Merge pull request #12874 from Godmartinz/feature/sc-23130

2023-05-03 11:43:44 -07:00

SettingsController.php

Disallow saving data if app is locked

2023-05-10 01:14:54 -07: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

Added comments and spacing for readability

2022-11-16 17:48:28 +00:00