Johnson Yi 92fe1287ea Do not saml login automatically after normal logout

2022-04-29 15:35:08 +00:00

..

Accessories

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

2022-03-03 21:59:38 -08:00

Account

clean up

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

Api

Merge master back down into develop

2022-03-29 16:28:43 +01:00

Assets

fixes typo

2022-04-07 11:18:16 -07:00

Auth

Do not saml login automatically after normal logout

2022-04-29 15:35:08 +00:00

Components

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

2022-03-03 21:59:38 -08:00

Consumables

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

2022-03-03 21:59:38 -08:00

Kits

Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO

2022-01-06 12:35:37 +01:00

Licenses

Fixed #7824

2022-01-10 14:03:28 -05:00

Users

Update Assets locations when user's location changes whey they got bulk-edited

2022-04-06 19:23:49 -05: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

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

2022-03-03 21:59:38 -08:00

AssetModelsController.php

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

2022-02-20 13:29:12 -08: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

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

2022-02-20 13:29:12 -08:00

CustomFieldsetsController.php

Merge master into develop

2022-01-12 20:51:33 -08:00

DashboardController.php

Added additional boxes to the dashboard

2021-06-28 16:36:15 -07:00

DepartmentsController.php

Adopt Laravel coding style

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

ImportsController.php

Adopt Laravel coding style

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

LocationsController.php

Adopt Laravel coding style

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

ManufacturersController.php

Adopt Laravel coding style

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

ModalController.php

Merge master into develop

2022-01-12 20:51:33 -08:00

ProfileController.php

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

2022-02-01 18:53:05 -08:00

ReportsController.php

fix showDeletedFunction by reverting #9508

2022-03-16 20:20:46 +01:00

SettingsController.php

Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync

2022-03-29 12:06:01 +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

Revert the unnecessary optimization for asset->count()

2022-01-13 19:37:08 -08:00