Brady Wetherington 09c1298e03 Merge branch 'develop' into livewire_importer_2_squashed_and_rebased ...

I'll be taking in the changes to the importer front-end elsewhere

2023-03-07 18:51:05 -08:00

..

Accessories

Hoist the autorization higher in the stack so we’re not doing logic or math when the user isn’t authorized to touch this

2023-01-23 21:49:17 -08:00

Account

Store the acceptance dates with format YYY-mm-dd

2023-01-30 15:11:41 -06:00

Api

Merge pull request #12624 from snipe/features/added_vip_and_byod_to_importer

2023-03-06 17:11:28 -08:00

Assets

Merge branch 'develop' into features/make_eol_sortable

2023-02-28 18:05:09 -08: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

Disallow uploads if app is locked

2022-11-03 13:52:23 -07:00

Consumables

Disallow uploads if app is locked

2022-11-03 13:52:23 -07:00

Kits

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

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

Licenses

Use correct LicenseSeat property

2023-03-02 19:33:32 -06:00

Users

Merge pull request #12406 from akemidx/vip_tag

2023-02-23 12:23:29 -08: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

removes dead code

2022-10-18 15:25:38 -07:00

AssetModelsController.php

Replace 'required' rule with 'nullable' to allow blank default customfields values

2022-08-25 18:16:50 -05:00

AssetModelsFilesController.php

Use new upload string

2022-11-03 13:57:50 -07:00

BulkAssetModelsController.php

Merge master into develop

2022-01-12 20:51:33 -08: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

Adopt Laravel coding style

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

CustomFieldsController.php

Remove e() function from customfield format input

2023-02-12 16:27:37 -06:00

CustomFieldsetsController.php

Fixed mismatched field/fieldset

2023-02-07 13:31:50 -08: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

GroupsController.php

Adopt Laravel coding style

2021-06-10 20:15:52 +00: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

Adopt Laravel coding style

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

ModalController.php

Fixed visibility for constants and methods

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

ProfileController.php

Use the imageHandler for profile avatar changes

2023-01-21 18:05:20 -08:00

ReportsController.php

The 'download activity report' displayed the wrong value for 'admin'

2023-03-01 12:23:13 -08:00

SettingsController.php

Merge pull request #12612 from manuteleco/add_path_in_preflight_url_message

2023-03-06 09:36:15 -08: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