snipe
|
b6f05bff1f
|
Merge branch 'develop' into feature/locations_with_companies
|
2025-01-17 17:18:17 +00:00 |
|
snipe
|
79951c3f17
|
Set support footer to on in reset demo script
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-17 16:37:00 +00:00 |
|
snipe
|
221ffb446c
|
Fixed #15946 - added comtent type to webhook test
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-17 16:36:43 +00:00 |
|
snipe
|
57f80290a1
|
Merge pull request #16081 from marcusmoore/fixes/zerofill-count-on-setup
|
2025-01-16 21:22:02 +00:00 |
|
Marcus Moore
|
4b2ede7a71
|
Use 0 for zerofill_count if nothing provided
|
2025-01-16 12:20:14 -08:00 |
|
snipe
|
5e465fa417
|
Merge remote-tracking branch 'origin/master' into develop
|
2025-01-16 19:06:02 +00:00 |
|
Marcus Moore
|
96379d0a62
|
Use provided zerofill_count
|
2025-01-15 16:39:50 -08:00 |
|
snipe
|
bbc9ed5778
|
Fixed audit date default on bulk audit
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-15 22:28:50 +00:00 |
|
snipe
|
9a4fd81c70
|
Use correct icon for ad-hoc notes on assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-14 14:34:17 +00:00 |
|
snipe
|
1c8d94c953
|
Merge pull request #15525 from akemidx/updated_ad_hoc_notes
|
2025-01-14 11:33:21 +00:00 |
|
snipe
|
ca11efd3ee
|
Merge pull request #16036 from Godmartinz/unaccepted_assets_reports_memory_fix
|
2025-01-13 22:23:30 +00:00 |
|
snipe
|
587449ef97
|
Merge pull request #15981 from akemidx/bug/sc-27551
|
2025-01-13 17:35:58 +00:00 |
|
snipe
|
06ffac9d7d
|
Merge pull request #16046 from uberbrady/ldap_asset_location_switch_fix
|
2025-01-13 17:33:13 +00:00 |
|
Nebel
|
9f0581275b
|
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode
|
2025-01-13 15:49:32 +01:00 |
|
snipe
|
41da04cd22
|
Merge pull request #16018 from aHVzY2g/patch-3
|
2025-01-13 13:55:04 +00:00 |
|
Marlon Spangenberg
|
0c4fc56b80
|
increased label/field size to 2.5, reduced supported fields to 3
|
2025-01-13 12:20:56 +01:00 |
|
Marlon Spangenberg
|
907f0553d4
|
moved label value into the same line, changed label font to freemono
|
2025-01-13 12:14:30 +01:00 |
|
Godfrey M
|
001ccf1ce9
|
adds translation string instead of hardcoded message
|
2025-01-09 14:47:07 -08:00 |
|
Godfrey M
|
082a974ee3
|
changed from redirect with error to with warning
|
2025-01-09 14:26:54 -08:00 |
|
Godfrey M
|
152c23b8f3
|
changed log from warning to error
|
2025-01-09 12:55:25 -08:00 |
|
Godfrey M
|
b635822a85
|
add try/catch around notification failing for inactive slack hooks
|
2025-01-09 12:51:54 -08:00 |
|
Brady Wetherington
|
049b9c542b
|
Conditionally update assets when user's location moves via LDAP
|
2025-01-09 13:43:59 +00:00 |
|
Godfrey M
|
92762896ef
|
moar removal
|
2025-01-07 15:10:46 -08:00 |
|
Godfrey M
|
c699baf519
|
removed commented out code, and unrelated crap
|
2025-01-07 15:10:00 -08:00 |
|
Godfrey M
|
97b765b5cc
|
improved reports query, could be further optimized
|
2025-01-07 15:06:09 -08:00 |
|
snipe
|
40b41e646d
|
Merge pull request #16033 from Godmartinz/barcode-fix
|
2025-01-07 19:59:30 +00:00 |
|
snipe
|
63853db450
|
Merge pull request #16035 from marcusmoore/fixes/unaccepted-assets-reminder
|
2025-01-07 19:58:23 +00:00 |
|
Marcus Moore
|
48dd3252cb
|
Fix parameter order
|
2025-01-07 11:47:16 -08:00 |
|
Godfrey M
|
f6abf90ba0
|
fix locale check
|
2025-01-07 10:51:48 -08:00 |
|
Godfrey M
|
83ee0e0fb6
|
untangled code visibility from each label engine
|
2025-01-07 10:37:59 -08:00 |
|
Godfrey M
|
94f44d1b77
|
fix label type values in db and defaults. update help text
|
2025-01-07 10:00:52 -08:00 |
|
Godfrey M
|
e12c7473f8
|
tinkering with the polymorphic eager load
|
2025-01-07 09:08:36 -08:00 |
|
Godfrey M
|
0ec25d55a0
|
Merge branch 'develop' into unaccepted_assets_reports_memory_fix
|
2025-01-06 12:28:17 -08:00 |
|
Godfrey M
|
bb03e00279
|
fix deprecation on asset obs get unaccept report to populate
|
2025-01-06 11:26:45 -08:00 |
|
snipe
|
9672a13402
|
Set order by on companies
Signed-off-by: snipe <snipe@snipe.net>
|
2025-01-06 16:11:18 +00:00 |
|
aHVzY2g
|
eba1f03363
|
Added: TZe_24mm_D.php modified TZe_24mm_A that includes 1D code
New label format for TZe_24mm that includes all fields of TZe_24mm_A with the addition of the 1D code at the bottom of the label.
|
2025-01-03 11:10:44 +01:00 |
|
snipe
|
d410f168bd
|
Removed extra checks, since we already check higher up
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-26 10:28:27 +00:00 |
|
snipe
|
b38f9ad33c
|
Updated return types
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-26 10:18:00 +00:00 |
|
snipe
|
f8311815ee
|
Check for valid asset before accessing properties
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-26 10:17:45 +00:00 |
|
snipe
|
3edb501973
|
Fixed typo sanitze to sanitize
Signed-off-by: snipe <snipe@snipe.net>
|
2024-12-25 20:45:19 +00:00 |
|
Marcus Moore
|
876ab44a16
|
Update settings property keys
|
2024-12-19 15:18:27 -08:00 |
|
snipe
|
15296d2b1c
|
Merge pull request #15714 from akemidx/saving_custom_report_template
Saved Custom Report Templates
|
2024-12-19 22:43:59 +00:00 |
|
snipe
|
1434522149
|
Merge pull request #15912 from marcusmoore/bug/harden-checkout-validation-v2
Harden asset checkout validation
|
2024-12-19 22:42:06 +00:00 |
|
snipe
|
6b8c1eb523
|
Merge branch 'develop' into testing/accessories-ui
|
2024-12-19 22:38:04 +00:00 |
|
snipe
|
26264e1d55
|
Merge branch 'develop' into testing/consumable-ui
|
2024-12-19 22:34:10 +00:00 |
|
snipe
|
d49bfb562a
|
Merge branch 'develop' into testing/license-checkin
|
2024-12-19 22:29:31 +00:00 |
|
snipe
|
8d24c0af0d
|
Merge pull request #15982 from spencerrlongg/bug/sc-27228
Update Checkout Button Permission for Predefined Kits
|
2024-12-19 22:25:51 +00:00 |
|
snipe
|
0dce3b8b8c
|
Merge pull request #15987 from spencerrlongg/bug/sc-27192
Add `string` to Password Reset Username Rules
|
2024-12-18 20:09:14 +00:00 |
|
spencerrlongg
|
5042c2b30a
|
oops, rm dump
|
2024-12-18 13:58:18 -06:00 |
|
spencerrlongg
|
b45cf6124f
|
add note
|
2024-12-18 13:57:18 -06:00 |
|