snipe 0939591efb Merge pull request #11003 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null_develop ...

Fixes QueryException Integrity constraint violation: Column 'order' cannot be null for develop

2022-05-05 13:28:00 -07: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 branch 'master' into rcs/merge_master_into_develop_for_rc_8

2022-04-28 17:49:06 +01:00

Assets

Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8

2022-04-28 17:49:06 +01: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

Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8

2022-04-28 17:49:06 +01:00

Users

Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8

2022-04-28 17:49:06 +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

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

…

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

…

Controller.php

…

CustomFieldsController.php

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

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

CustomFieldsetsController.php

Adds an integer casting to the order input field so it cannot be null

2022-05-01 15:27:05 -05:00

DashboardController.php

…

DepartmentsController.php

…

DepreciationsController.php

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

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

GroupsController.php

…

HealthController.php

…

ImportsController.php

…

LocationsController.php

…

ManufacturersController.php

…

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

Evaluate if an item still exists before trying to get its name in the report

2022-05-01 13:25:55 -05: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

…

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