 snipe
|
199eefafa1
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-27 14:38:47 +01:00 |
|
|
snipe
|
adc3a34929
|
Fixed copy for encrypted custom fields
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 14:38:36 +01:00 |
|
|
snipe
|
cb2ffe6b3f
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 14:02:39 +01:00 |
|
|
snipe
|
c5b58f9ecc
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-27 13:32:25 +01:00 |
|
|
snipe
|
b3e3d01672
|
Fixed LDAP icon spacing
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-27 13:32:02 +01:00 |
|
|
snipe
|
6b68fe4de6
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-27 13:30:19 +01:00 |
|
|
snipe
|
3461bbfdb3
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# 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/mix-manifest.json
|
2025-08-27 12:28:22 +01:00 |
|
|
Godfrey M
|
671c113cd2
|
add coma to translation"
|
2025-08-26 16:07:04 -07:00 |
|
|
Godfrey M
|
8a74d21ede
|
fixes checkout emails to location for assets and accessories"
|
2025-08-26 16:00:26 -07:00 |
|
|
Godfrey M
|
75995b2109
|
fix checkout to location email
|
2025-08-26 15:34:38 -07:00 |
|
|
snipe
|
22852c27f8
|
Use generic length for asterisks
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 15:38:56 +01:00 |
|
|
snipe
|
f4a94d975d
|
Fixes #17704 - retain linebreaks in clipboard for multi-line custom field copying
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 15:33:19 +01:00 |
|
|
snipe
|
2b401b965b
|
Fixed casing
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 15:22:00 +01:00 |
|
|
snipe
|
314bc5b44f
|
Added manager
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 15:14:29 +01:00 |
|
|
snipe
|
76374f0d5a
|
Updated text
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 15:14:22 +01:00 |
|
|
snipe
|
58944a38eb
|
Make screen and table wider
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 14:59:11 +01:00 |
|
|
snipe
|
469e3bd475
|
Nicer ldap preview layout, show all mapped fields
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 14:51:34 +01:00 |
|
|
snipe
|
17650c5735
|
Changed field title
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-26 14:03:11 +01:00 |
|
|
snipe
|
a6b74d56c6
|
Merge pull request #17709 from grokability/add-display-name-to-users-fixed
Added display name to users for LDAP/SCIM, added new sync fields (replaced #17650)
|
2025-08-26 12:39:25 +01:00 |
|
|
Godfrey M
|
dd742a2e4a
|
add a check for audit notification variables in MS Teams and a translation
|
2025-08-25 15:10:41 -07:00 |
|
|
snipe
|
3524e23e38
|
Fixed tests
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-25 17:17:45 +01:00 |
|
|
snipe
|
07dbc6842c
|
Are you KIDDING ME, Github??
This reverts commit c8e79aa5ca, reversing
changes made to e60f2b2332.
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-25 15:56:28 +01:00 |
|
|
snipe
|
c8e79aa5ca
|
Merge branch 'develop' into add-display-name-to-users-fixed
|
2025-08-25 15:28:20 +01:00 |
|
|
snipe
|
b6d397bcca
|
Updated ->present()->fullName() to ->display_name
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-25 14:57:34 +01:00 |
|
|
snipe
|
6503f9c667
|
Revert "Merge pull request #17650 from grokability/add-displayName-to-users"
This reverts commit 4770e469b4, reversing
changes made to 29a18c7c8b.
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-21 20:23:47 +01:00 |
|
|
snipe
|
4770e469b4
|
Merge pull request #17650 from grokability/add-displayName-to-users
Add display name to users for LDAP/SCIM, added new sync fields
|
2025-08-21 18:22:34 +01:00 |
|
|
snipe
|
822339fe42
|
Moved warning
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-21 13:13:11 +01:00 |
|
|
snipe
|
b84d9282ca
|
Use normal locale for warranty
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-21 13:05:01 +01:00 |
|
|
snipe
|
00a17cd55e
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-21 11:51:50 +01:00 |
|
|
snipe
|
15f97b6cb9
|
Merge pull request #17591 from Godmartinz/add-serial-to-expiring-asset-report
Adds #17440 serial number column to Expiring Assets Report
|
2025-08-21 11:14:45 +01:00 |
|
|
snipe
|
7612ee6b08
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-20 14:17:38 +01:00 |
|
|
snipe
|
618106c103
|
Fixed #17674 - added odp, ods, odt to accepted files
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-20 14:11:20 +01:00 |
|
|
snipe
|
2fcd8cd261
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-20 11:00:26 +01:00 |
|
|
snipe
|
2a37aa3b49
|
Fixed tooltip
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-20 10:34:05 +01:00 |
|
|
snipe
|
0ffa47a2c6
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-20 09:58:54 +01:00 |
|
|
snipe
|
bf591320af
|
Fixed #17665 - delete custom report modal
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-20 09:58:30 +01:00 |
|
|
snipe
|
07b25fe376
|
Add display name to summary
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 20:52:18 +01:00 |
|
|
snipe
|
c2ecd20b7d
|
Updated field text
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 20:47:48 +01:00 |
|
|
snipe
|
0823c23a6e
|
Fixed placeholder text
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 18:51:56 +01:00 |
|
|
snipe
|
b3f0ce4b2a
|
Use fieldsets for LDAP settings
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 18:38:47 +01:00 |
|
|
snipe
|
8b83584b67
|
Added mapping fields to LDAP
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 18:31:58 +01:00 |
|
|
Godfrey M
|
9eb686fe08
|
changes translation to administrator
|
2025-08-19 10:23:15 -07:00 |
|
|
Godfrey M
|
ed402e0122
|
adds serial underneath name
|
2025-08-19 10:10:20 -07:00 |
|
|
snipe
|
a8d0a4a95d
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/dist/all.js
# public/js/dist/all.js.map
# public/mix-manifest.json
|
2025-08-19 14:12:58 +01:00 |
|
|
snipe
|
cdd12df81a
|
Fixed #17627 - jquery UI fix for draggable/sortable
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 14:12:06 +01:00 |
|
|
snipe
|
3fb0804cef
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-19 13:57:36 +01:00 |
|
|
snipe
|
050a3afc74
|
Fixed #17649 - nicer layout on new location modal
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 13:56:21 +01:00 |
|
|
snipe
|
270401c693
|
Added display name to user create modal
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 13:12:57 +01:00 |
|
|
snipe
|
6a8e1566fe
|
Added display_name to a few more places
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 12:56:11 +01:00 |
|
|
snipe
|
ced30082a6
|
Added display_name as user field
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 12:10:28 +01:00 |
|