snipe
9d61234f0c
Merge pull request #16612 from snipe/re-fix_db_dump_ssl_fix
...
Fixes #16610 , regression in #16543
2025-04-01 21:32:15 +01:00
snipe
bef650757d
Fixes #16610 , regression in #16543
...
Signed-off-by: snipe <snipe@snipe.net>
2025-04-01 21:25:35 +01:00
snipe
24bfbc06f0
Merge remote-tracking branch 'origin/develop'
2025-04-01 19:40:03 +01:00
snipe
cb6e7f7b6e
Merge pull request #16561 from spencerrlongg/bug/api_get_by_serial_add_pagination
...
Adds Pagination to Hardware By Serial API Request
2025-04-01 19:26:28 +01:00
snipe
c305284930
Merge pull request #15922 from spencerrlongg/feature/sc-24347
...
Requestable/Request Item API Endpoints
2025-04-01 18:15:42 +01:00
snipe
6c47f1c07f
Added test
...
Signed-off-by: snipe <snipe@snipe.net>
2025-04-01 17:44:44 +01:00
snipe
5d265f5bfd
Change to minutes
...
Signed-off-by: snipe <snipe@snipe.net>
2025-04-01 15:01:34 +01:00
snipe
daaad4fe9d
Removed unneeded strings
...
Signed-off-by: snipe <snipe@snipe.net>
2025-04-01 14:36:53 +01:00
snipe
40ae5d421b
Updated maxLoginAttempts and throttle duration
...
Signed-off-by: snipe <snipe@snipe.net>
2025-04-01 14:36:45 +01:00
snipe
5eb9f353b5
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
2025-04-01 11:25:33 +01:00
akemidx
d96498ab1f
this is a redo after a borked rebase
2025-03-31 18:33:20 -04:00
spencerrlongg
bfd827e529
added more eager loading
2025-03-31 12:28:03 -05:00
snipe
d95549bbcf
Merge pull request #16594 from uberbrady/fix_consumable_model_copy
...
Fixes [FD-47675 ] Fix consumable model number copy-to-clipboard button
2025-03-31 18:26:46 +01:00
snipe
e10071a68e
Merge pull request #16595 from uberbrady/fix_whitespace_encrypted_custom_fields_display
...
Fix whitespace encrypted custom fields display [FD-46570]
2025-03-31 18:25:13 +01:00
Brady Wetherington
92a77afd0b
Fixes the clipboard button copying whitespace at the end of custom fields
2025-03-31 13:55:38 +01:00
Brady Wetherington
1369b993a4
Fix JS copy-to-clipboard for consumable model_num
2025-03-31 13:13:37 +01:00
snipe
382414df98
Merge pull request #16559 from Godmartinz/StoreLabelSettings_fix
...
Fix Form save error when using old label engine
2025-03-31 12:39:08 +01:00
snipe
6846c7d510
Merge pull request #16536 from akemidx/moving_warranty_info
...
Moving warranty/depreciation to be with the other cost/eol values
2025-03-31 12:35:32 +01:00
snipe
1d3069fe84
Merge pull request #16540 from marcusmoore/bug/sc-28607
...
Early return null from location transformer for missing accessory
2025-03-31 12:34:22 +01:00
snipe
13940071a9
Merge pull request #16546 from marcusmoore/bug/sc-28024
...
Fixed potential bad method call and premature email sending in bulk asset checkout
2025-03-31 12:32:50 +01:00
snipe
6870698cdc
Add @ntaylor-86 as a contributor
2025-03-31 12:32:25 +01:00
snipe
4aa13c8dd4
Merge pull request #16543 from ntaylor-86/fixes/laravel-backup-ssl-error
...
Fixed #16217 : database config, added option to skip ssl on the database dump
2025-03-31 12:32:00 +01:00
snipe
44db2dc78e
Merge pull request #16520 from marcusmoore/bug/sc-28673
...
Remove unneeded eager loading for user show page
2025-03-31 12:31:12 +01:00
snipe
2e17e80ea9
[Snyk] Upgrade acorn from 8.14.0 to 8.14.1 #16587
...
Signed-off-by: snipe <snipe@snipe.net>
2025-03-31 12:30:09 +01:00
snipe
836d7ca8f9
[Snyk] Upgrade bootstrap-table from 1.24.0 to 1.24.1 #16588
...
Signed-off-by: snipe <snipe@snipe.net>
2025-03-31 12:29:00 +01:00
snipe
18e6a18389
Merge pull request #16576 from marcusmoore/fixes/api_company_note
...
Fixed notes not being saved and update for companies via api
2025-03-31 12:20:36 +01:00
snipe
1dd050ac0f
Merge pull request #16577 from marcusmoore/tests/login-logging
...
Added tests around login attempt logging
2025-03-29 23:30:05 -01:00
Marcus Moore
b8b0e3200e
Add tests around loggin login attempts
2025-03-27 17:27:28 -07:00
Marcus Moore
bc77c8c885
Add notes to $fillable
2025-03-27 10:57:34 -07:00
Marcus Moore
c095f330e1
Add failing tests
2025-03-27 10:56:33 -07:00
Marcus Moore
e0e08f284e
Add tests for creating and patching companies via api
2025-03-27 10:54:42 -07:00
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
spencerrlongg
168a3df157
Fix condition in statusMeta for correct property check
...
Updated the conditional check to use 'assigned_to' instead of 'assigned' for determining the deployment status. This ensures the code references the correct property on the model.
2025-03-25 14:39:51 -05:00
Marcus Moore
ac597b517b
Remove blank line
2025-03-24 12:39:17 -07:00
Marcus Moore
ac56640d40
Spilt test scenarios
2025-03-20 16:21:42 -07:00
Marcus Moore
ce585539aa
Improve test name
2025-03-20 16:13:13 -07:00
Marcus Moore
2cfff8e07c
Formatting
2025-03-20 16:12:31 -07:00
Marcus Moore
0ceda098ff
Spilt test scenarios
2025-03-20 16:10:01 -07:00
Marcus Moore
db81209fe1
Organize existing tests
2025-03-20 16:01:28 -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
