87fe9d9d3d
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# public/css/build/app.css
# public/css/build/app.css.map
# public/css/build/overrides.css
# public/css/build/overrides.css.map
# public/css/dist/all.css
# public/css/dist/skins/_all-skins.css
# public/css/dist/skins/_all-skins.css.map
# public/css/dist/skins/_all-skins.min.css
# public/css/dist/skins/skin-contrast.css
# public/css/dist/skins/skin-contrast.css.map
# public/css/dist/skins/skin-contrast.min.css
# public/mix-manifest.json
2025-10-17 17:00:10 +01:00
b1ef3f51cb
Merge pull request #18064 from grokability/new-fieldsets
...
Use new fieldset component
2025-10-17 16:58:17 +01:00
e1b6488f8e
Use new fieldset component
2025-10-17 16:55:36 +01:00
a472dede2b
Merge pull request #18063 from grokability/improved-fieldset-UI-and-better-help-test-for-ldap-mapping
...
New legend styles and additional help hints for LDAP
2025-10-17 15:45:05 +01:00
263cc3f7a1
New styles and additional help hints for LDAP
2025-10-17 15:29:24 +01:00
d355812433
Updated assets
2025-10-16 19:06:22 +01:00
1afc14f5ab
Merge remote-tracking branch 'origin/develop'
2025-10-16 19:04:30 +01:00
8947b667ae
Fixed status labels skin for visited link buttons
2025-10-16 19:04:15 +01:00
6b41796d44
Fixed restore button on asset view page
2025-10-16 19:04:01 +01:00
6efe8eb55b
Small fix for high contrast skin
2025-10-16 18:33:33 +01:00
4c8f8918e8
Merge remote-tracking branch 'origin/develop'
2025-10-16 15:49:59 +01:00
4cb5bb1855
Merge pull request #18057 from grokability/user-selector-fix
...
Fixed #18053 - user selector missing on page load without cookies
2025-10-16 15:49:39 +01:00
eb007e025a
Fixed #18053 - user selector missing on page load without cookies
2025-10-16 15:47:25 +01:00
18aefa9dee
Merge remote-tracking branch 'origin/develop'
2025-10-16 15:10:29 +01:00
2ec540bd36
Updated language translations
2025-10-16 15:10:17 +01:00
1374ec408a
Merge pull request #18019 from akemidx/emdashcharfix
...
Fixed #17363 - Emdash Character Encoding error
2025-10-16 15:07:31 +01:00
8f8fed2b79
Merge remote-tracking branch 'origin/develop'
2025-10-16 14:33:30 +01:00
a1e6f01fe9
Fixed updating notes in bulk edit
2025-10-16 14:33:21 +01:00
d7496f22e5
Merge remote-tracking branch 'origin/develop'
2025-10-16 14:04:44 +01:00
7de25a1c37
Merge pull request #18056 from grokability/add-expected-checkin-to-view-assets
...
Added expected_checkin to user’s View Assigned page
2025-10-16 14:04:31 +01:00
78da89340c
Added expected_checkin to user’s View Assigned page
2025-10-16 13:59:59 +01:00
60606115fe
Merge remote-tracking branch 'origin/develop'
2025-10-16 12:46:47 +01:00
57b49fc31c
Check for array key for license report/formatters
2025-10-16 12:46:17 +01:00
6e90c8f6e6
Bumped hash for master
2025-10-16 11:28:37 +01:00
a7ff2595a5
Bumped hash
2025-10-16 11:28:01 +01:00
1edea6abef
Fixed RB-20347 - ambigious field in custom fields
2025-10-16 11:27:25 +01:00
3339d1999f
Merge remote-tracking branch 'origin/develop'
2025-10-16 11:12:56 +01:00
df3e8ec0f3
cleaning up notes
2025-10-15 17:35:25 -04:00
2dbec867d9
Merge pull request #18038 from boteroTradebe/develop
...
Fixed LDAP sync not syncing all user fields
2025-10-15 17:25:33 +01:00
b91d23023d
Fix blade template syntax for accessory fields
2025-10-14 13:45:58 +01:00
cc234c60b8
Update LdapSync.php to populate/update user fields
...
Added missing IF statements for address, city, state, and ZIP code. Previously, this information would be pulled via LDAP sync but would not update the user data due to the missing IF statements for these attributes.
2025-10-13 13:42:11 -05:00
f1883c8004
Merge remote-tracking branch 'origin/develop'
2025-10-13 14:48:46 +01:00
79f6ddc8ee
Merge pull request #18036 from grokability/better-messaging-for-bulk-deletes
...
Fixed #18034 - Shows success message on partial bulk delete success
2025-10-13 14:30:26 +01:00
89f439a18d
Shows success message on partial bulk delete success
2025-10-13 14:25:05 +01:00
79eb5bfad9
Merge pull request #18035 from grokability/fixes-bulk-error-notification
...
Fixed bulk error display to be more consistent and correct HTML
2025-10-13 14:02:11 +01:00
3a36b7dafd
Fixed display to be more consistent and correct HTML
2025-10-13 13:57:04 +01:00
1fe2fd9891
Merge pull request #17573 from spencerrlongg/feature/8709-bulk-deletion-of-asset-categories-suppliers-manufacturers
...
Fixed #8709 - Bulk Deletion of Categories, Suppliers, Manufa...
2025-10-13 13:20:13 +01:00
5fdb999ece
Merge branch 'develop' into feature/8709-bulk-deletion-of-asset-categories-suppliers-manufacturers
2025-10-13 13:07:53 +01:00
5a38d9c2b6
Merge pull request #18029 from grokability/dependabot/github_actions/develop/github/codeql-action-4
...
Bump github/codeql-action from 3 to 4
2025-10-13 12:00:49 +01:00
b1c7dc6cbb
Merge remote-tracking branch 'origin/develop'
2025-10-13 11:32:19 +01:00
b21b2ac41c
Merge pull request #18032 from grokability/move-asset-private-files
...
Added migration to move asset model private uploads
2025-10-13 11:31:55 +01:00
1396c597ef
Move files
2025-10-13 11:19:25 +01:00
46af72ee4e
Bump github/codeql-action from 3 to 4
...
Bumps [github/codeql-action](https://github.com/github/codeql-action ) from 3 to 4.
- [Release notes](https://github.com/github/codeql-action/releases )
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md )
- [Commits](https://github.com/github/codeql-action/compare/v3...v4 )
---
updated-dependencies:
- dependency-name: github/codeql-action
dependency-version: '4'
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com >
2025-10-13 08:19:22 +00:00
e3e8f553c8
Merge remote-tracking branch 'origin/develop'
2025-10-09 18:39:13 +01:00
549928d3d1
Updated assets
2025-10-09 18:38:59 +01:00
abefec9628
Upgraded jdpdf to ^3.0.3
2025-10-09 18:37:59 +01:00
b483eeded4
Merge remote-tracking branch 'origin/develop'
2025-10-09 11:24:47 +01:00
fab85dafa8
Added employee number and email to acceptance PDF
2025-10-09 11:24:16 +01:00
955faed919
Merge pull request #18018 from grokability/advanced-user-search
...
Normalize advanced search
2025-10-09 11:04:28 +01:00
3ff516180d
Merge remote-tracking branch 'origin/develop'
2025-10-09 10:56:08 +01:00
snipe