Commit graph

17365 commits

Author SHA1 Message Date
spencerrlongg
e273c7cbc5 Refactor asset retrieval to support pagination.
Introduced offset and limit handling for API asset queries to enable proper pagination. Adjusted the total count logic to maintain consistency in responses and ensure accurate transformation of assets.
2025-03-25 15:21:18 -05:00
Godfrey M
d28cc024cf add DefaultLabel if no label2_template is selected 2025-03-25 12:40:23 -07:00
Marcus Moore
02f109c3b5
Include input when redirecting back 2025-03-20 14:04:19 -07:00
Marcus Moore
0ed0a7f9f3
Avoid sending emails for asset checkouts that failed 2025-03-20 14:01:48 -07:00
Marcus Moore
b721b7d9c9
Add tests 2025-03-20 13:57:42 -07:00
Marcus Moore
976b3dc5ae
Improve test case 2025-03-20 13:38:12 -07:00
snipe
2d3514bbf8
Merge pull request #16545 from Godmartinz/activity_report_column_name_fix
changes translation from Admin Settings to Created By on the Activity Report
2025-03-20 19:37:42 -01:00
Marcus Moore
5dcd4b2942
Return valid error message 2025-03-20 13:26:27 -07:00
Marcus Moore
d645b42e12
Add failing test 2025-03-20 13:26:06 -07:00
Godfrey M
0ad985cbcd change translation 2025-03-20 12:40:46 -07:00
ntaylor-86
ad5099fac9 added .env variable to the other .env files 2025-03-20 23:27:29 +10:00
ntaylor-86
32736e2f74 added .env variable and database config to skip ssl for DB DUMP 2025-03-20 23:06:15 +10:00
Marcus Moore
cef83ad652
Avoid hard failure on missing accessory in location transformer 2025-03-19 14:11:47 -07:00
akemidx
5944034b8b moving warranty/depreciation to be with the other cost/eol values 2025-03-19 15:22:09 -04:00
akemidx
a398c4ab84 reset 2025-03-18 16:37:27 -04:00
akemidx
27417cdec7 removing depreciation logic (unneeded for purchase cost) 2025-03-18 16:36:36 -04:00
Jermops
711235f49c
Merge pull request #16519 from marcusmoore/bug/sc-28696
Fixed issue with bad email addresses in expiration alerts and upcoming audits
2025-03-18 09:15:41 -07:00
Marcus Moore
9aede45918
Remove unneeded eager loads 2025-03-17 14:43:23 -07:00
Marcus Moore
b26a73e385
Filter out empty email address in alerts 2025-03-17 12:30:15 -07:00
snipe
c711278b8b
Merge pull request #16486 from marcusmoore/bug/sc-28639
Fixed location being automatically populated on asset checkin screen
2025-03-12 23:26:08 +00:00
snipe
ff637f1926
Merge pull request #16497 from marcusmoore/fixes/diff-in
Fixed various carbon displays
2025-03-12 23:17:48 +00:00
Marcus Moore
4d978e0fc6
Fix eol rate in upcoming audit notification 2025-03-12 16:04:16 -07:00
Marcus Moore
167001ed54
Fix eol rate in tests 2025-03-12 16:01:32 -07:00
Marcus Moore
25fb1abc95
Fix eol rate in AssetObserver 2025-03-12 15:58:11 -07:00
Marcus Moore
658bef447d
Fix eol rate in Actionlog 2025-03-12 15:55:13 -07:00
Marcus Moore
a28ff22d03
Fix eol rate in ReportsController 2025-03-12 15:44:06 -07:00
Marcus Moore
63a1ee0047
Fix eol rate in AssetMaintenancesController 2025-03-12 15:38:54 -07:00
Marcus Moore
ab8f4454d1
Add failing test for updating asset maintenance 2025-03-12 15:38:46 -07:00
Marcus Moore
e439f1f42b
Fix eol rate in AssetMaintenancesController 2025-03-12 15:35:46 -07:00
Marcus Moore
9be27bdf07
Add failing test for creating asset maintenance 2025-03-12 15:35:14 -07:00
snipe
bfc122469c
Merge pull request #16495 from snipe/add_highlight_for_low_qty
Added highlight to items when the remaining is less than the min_amt
2025-03-12 21:23:15 +00:00
snipe
036c225dcf Fixed dashboard string
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 21:22:24 +00:00
snipe
083cf78305 Added footer style for nicer number cell padding
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 21:17:41 +00:00
Marcus Moore
824271078e
Fix eol rate in AssetsController 2025-03-12 13:55:12 -07:00
Marcus Moore
1122cd8567
Fix eol rate in asset transformer 2025-03-12 13:33:15 -07:00
Marcus Moore
6cf7df22cd
Fix eol rate on asset show page 2025-03-12 13:28:34 -07:00
snipe
7421d089ff Added formatter and centering in presenters
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 20:25:00 +00:00
snipe
bdb4bd73d2 Return an indicator for no value set
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 20:18:51 +00:00
snipe
bf88597132 Added qtySumFormatter and made seats formatter more generic
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 20:14:23 +00:00
snipe
dfacd876d5 Added remaining/min_amt to transformers
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 20:13:15 +00:00
snipe
dbe78c30d5
Merge pull request #16491 from snipe/bug/sc-28671
Fixed new user modal pre-populating with first name and last name of acting user
2025-03-12 18:05:57 +00:00
snipe
c1601b9a8c Updated tests
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 17:28:50 +00:00
snipe
aa8e9f61d2 Check for value override
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 17:28:44 +00:00
snipe
163ddc8026 Check for value override
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 17:28:29 +00:00
snipe
c73dba4a43 Better visual spacing
Signed-off-by: snipe <snipe@snipe.net>
2025-03-12 17:28:05 +00:00
snipe
5e61a814a7
Merge pull request #16489 from marcusmoore/bug/sc-28644
Fixed timestamp in action log for bulk accessory check in
2025-03-12 14:56:52 +00:00
Marcus Moore
b5fa538a54
Set created_by correctly in he action log 2025-03-11 16:05:02 -07:00
snipe
fcdc1494c2
Merge pull request #16443 from azmcnutt/feature/labels_Avery_5520_1DBarcode
Nice work! Thank you!
2025-03-11 22:12:09 +00:00
snipe
badb367e74
Merge pull request #16445 from ubc-cpsc/bugfix/CVE-2025-27515
Fixes CVE-2025-27515: Laravel has a File Validation Bypass
2025-03-11 21:55:58 +00:00
snipe
2960a13772 Upgrade webpack from 5.97.1 to 5.98.0 #16461
Signed-off-by: snipe <snipe@snipe.net>
2025-03-11 21:24:44 +00:00