23220 Commits

Author SHA1 Message Date
snipe 3680198d61 Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	config/version.php
v8.6.2
2026-06-13 19:22:01 +01:00
snipe da86e919d9 Bumped version to v8.6.2 2026-06-13 19:19:50 +01:00
snipe c98eea1ce5 Merge remote-tracking branch 'origin/develop' 2026-06-13 18:02:13 +01:00
snipe 45d6a491cb Localization: Fixed #19173 - use translatoon string for depreciation helper 2026-06-13 18:02:00 +01:00
snipe 3f77a6eeab Merge remote-tracking branch 'origin/develop' 2026-06-13 17:57:19 +01:00
snipe 3dc90f89f6 Localization: Fixed #19176 - use translation key for “send email” 2026-06-13 17:57:09 +01:00
snipe 5333837b20 Merge remote-tracking branch 'origin/develop' 2026-06-13 14:51:29 +01:00
snipe e2bea57146 Merge pull request #19167 from grokability/fmcs-scope-check-updates-for-multiple-companies
FMCS/Console: Fixed #19166 scope check updates for multiple companies, adds floater
2026-06-13 14:51:01 +01:00
snipe 43a32071f1 FMCS/Companyable Trait: refactor API call to use canCheckoutTo 2026-06-13 14:38:32 +01:00
snipe e3a9872d28 Updated tests 2026-06-13 13:18:37 +01:00
snipe 75f86cd669 FMCS+location+floater+importer: handle the importer as well 2026-06-13 12:55:10 +01:00
snipe 73f72cbbb0 Use the new companyable trait in the bulk assets controller 2026-06-13 12:42:48 +01:00
snipe 2033f25386 FMCS/Floater: Refactor logic into the companyable trait 2026-06-13 12:36:15 +01:00
snipe 8d0a6af2aa Refactor into the Companyable trait 2026-06-13 12:35:48 +01:00
snipe 2aae0cb793 Bumped hash 2026-06-12 22:27:32 +01:00
snipe caf5e347e3 Merge remote-tracking branch 'origin/develop' 2026-06-12 22:26:31 +01:00
snipe a698ba3082 Dev assets 2026-06-12 22:25:47 +01:00
snipe b57d286b15 Bumped hash 2026-06-12 22:25:30 +01:00
snipe 3cd5e86527 Updated language strings 2026-06-12 22:23:44 +01:00
snipe 31cf7ba6b5 Merge remote-tracking branch 'origin/develop' 2026-06-12 22:04:38 +01:00
snipe bccba46332 Merge pull request #19170 from marcusmoore/fixes/21586-importer-error-handling
Importer: allow rendering simple error messages
2026-06-12 22:02:52 +01:00
snipe 70357ada3d Merge pull request #19175 from marcusmoore/fixes/21665-filter-request-validation
Reporting: improve validation for item and target types
2026-06-12 22:02:30 +01:00
snipe 6769424aa2 Merge remote-tracking branch 'origin/develop' 2026-06-12 21:52:43 +01:00
snipe 043ad713e7 Merge pull request #19115 from grokability/#19096-and-#19095-company-and-location-and-groups-in-scim
Fixed #19095 and #19096 - SCIM updates in Azure/Entra
2026-06-12 21:52:32 +01:00
snipe bb178b0a5c Merge pull request #19183 from uberbrady/#19096-and-#19095-company-and-location-and-groups-in-scim
SCIM: Fix address handling and work around Entra email changes
2026-06-12 21:51:37 +01:00
Brady Wetherington 288bded7d9 SCIM: Fix address handling and work around Entra email changes 2026-06-12 21:43:47 +01:00
snipe 5c87735218 Merge remote-tracking branch 'origin/develop' 2026-06-12 19:55:18 +01:00
snipe d12ad3d538 Table row selection: Use document.getElementById and DOM/jQuery element constructors 2026-06-12 19:55:07 +01:00
snipe f269cfec34 Merge remote-tracking branch 'origin/develop' 2026-06-12 19:18:01 +01:00
snipe 905d498ecd Maintenances: Fixed FD-55977 - Cross-company asset maintenance re-parenting via API update 2026-06-12 19:17:44 +01:00
snipe 802067f398 Acceptances: Fixed FD-55978 - Cross-company deletion of pending checkout acceptances via unscoped report endpoint 2026-06-12 19:15:36 +01:00
snipe a212f87acd Merge remote-tracking branch 'origin/develop' 2026-06-12 18:53:31 +01:00
snipe b40e227ad3 Merge pull request #19182 from uberbrady/fix_too_many_placeholders
Custom Asset Report: Fixed [RB-21669] - use subquery for action_date
2026-06-12 18:45:22 +01:00
Brady Wetherington b89504e1c3 Custom Asset Report: Fixed [RB-21669] - use subquery for action_log action_date 2026-06-12 17:49:48 +01:00
snipe c8ae09cd43 FMCS location scoping - Added tests 2026-06-12 17:26:57 +01:00
snipe 8ebddd95ff FMCS+location scoping - Fixed scope boundaries 2026-06-12 16:46:23 +01:00
snipe c14880dfca Oh, pint 2026-06-12 16:10:29 +01:00
snipe a27c551f64 Style changes requested 2026-06-12 16:10:17 +01:00
Marcus Moore e71453cb5d Reporting: re-add camel and pascal casing for asset model and license seat 2026-06-11 12:41:49 -07:00
Marcus Moore bb19add3b6 Reporting: improve validation 2026-06-11 12:25:40 -07:00
snipe 9bd6396a15 Merge pull request #19162 from marcusmoore/fixes/21663-audit-notification
Auditing: Added try catch around sending notification
2026-06-11 00:41:07 +01:00
Marcus Moore b060327219 Importer: allow rendering simple error messages
[RB-21586]
2026-06-10 11:51:03 -07:00
Marcus Moore 8b383df13f Logging: use warning instead of error 2026-06-10 09:53:30 -07:00
snipe 6a0ec69451 FMCS/Validation: Fixed #19166 - translate error messages on FMCS fail 2026-06-10 12:44:46 +01:00
snipe 66bf6275b8 Merge branch 'develop' into fmcs-scope-check-updates-for-multiple-companies 2026-06-10 12:34:09 +01:00
snipe 6fc2ff7252 FMCS console checker: added test 2026-06-10 12:15:28 +01:00
snipe 0f6367bb17 FMCS: Extended checks to accessories, bulk controllers, etc 2026-06-10 11:47:54 +01:00
snipe e3190c3922 FMCS Admin Settings: updated language 2026-06-10 11:41:02 +01:00
snipe 53628d6ae3 FMCS: Users API - Check for floater in results 2026-06-10 11:26:41 +01:00
snipe d03f68ae34 FMCS: Updated floater value in controller 2026-06-10 11:26:12 +01:00