 Godfrey M
|
fea0189479
|
Merge branch 'fix-factory-auto-gen-action-logs' into add_types_to_unaccepted_asset_report
|
2025-09-24 15:43:27 -07:00 |
|
|
Godfrey M
|
9ac2ea2a52
|
fix test to check all mailable types for reminders
|
2025-09-24 13:22:33 -07:00 |
|
|
Godfrey M
|
0ce20c1edd
|
fix send reminder method to handle other types
|
2025-09-23 18:40:03 -07:00 |
|
|
Godfrey M
|
3527c357cc
|
whoops
|
2025-09-23 16:57:06 -07:00 |
|
|
Godfrey M
|
2b5254e68f
|
fixed, eager loading, variable names, clean up
|
2025-09-23 16:55:10 -07:00 |
|
|
Godfrey M
|
5af85bfe7d
|
further clean up
|
2025-09-23 12:10:50 -07:00 |
|
|
Godfrey M
|
20adad3c6b
|
fix company name link, clean up query
|
2025-09-23 12:09:21 -07:00 |
|
|
Godfrey M
|
ca8eae4064
|
updated the csv values to be plain
|
2025-09-23 11:40:29 -07:00 |
|
|
Godfrey M
|
7077faaf4a
|
updated the postassetAcceptanceReport query and rows
|
2025-09-23 11:08:37 -07:00 |
|
|
Marcus Moore
|
fb9fb9c097
|
Merge branch 'develop' into fixes/17404-prevent-bulk-checkout-across-companies
# Conflicts:
# app/Http/Controllers/Assets/BulkAssetsController.php
# tests/Feature/Checkouts/Ui/BulkAssetCheckoutTest.php
|
2025-09-22 10:52:04 -07:00 |
|
|
snipe
|
90c242a441
|
Merge pull request #17897 from marcusmoore/fixes/17896-prevent-bulk-checkout-of-checked-out-assets
Fixed #17896 - Prevent assigned assets from being bulk checked out
|
2025-09-19 07:03:43 +01:00 |
|
|
Marcus Moore
|
7a3596c86d
|
Test against other types
|
2025-09-18 17:21:27 -07:00 |
|
|
Marcus Moore
|
ac8a9e38f0
|
Implement fix
|
2025-09-18 17:18:27 -07:00 |
|
|
Marcus Moore
|
a02a96d5c4
|
Extract translation string
|
2025-09-18 12:57:56 -07:00 |
|
|
Marcus Moore
|
47e9e4704d
|
Improve error message
|
2025-09-18 12:56:36 -07:00 |
|
|
Marcus Moore
|
b2ad9d404e
|
Fix re-population of assets
|
2025-09-18 12:38:11 -07:00 |
|
|
Godfrey M
|
51ce570eb3
|
attempt to sort chronologically, can not resort still
|
2025-09-18 11:01:40 -07:00 |
|
|
Marcus Moore
|
e639d7726b
|
Disallow bulk checkout across companies
|
2025-09-17 14:32:27 -07:00 |
|
|
snipe
|
8ea339f0ef
|
More small tweaks
|
2025-09-17 22:00:49 +01:00 |
|
|
snipe
|
89b36ba63f
|
Derp. Uncomment the acceptance.
|
2025-09-17 21:43:40 +01:00 |
|
|
snipe
|
1d3dfa1fa4
|
Pull the acceptance stuff into the model
|
2025-09-17 21:43:17 +01:00 |
|
|
snipe
|
ca567eec8a
|
Small adjustments for layout
|
2025-09-17 21:08:13 +01:00 |
|
|
Godfrey M
|
dcbb09bbd7
|
added checkoutable class
|
2025-09-16 15:59:53 -07:00 |
|
|
Godfrey M
|
58eac619ea
|
add checkoutable class, rework blade for unaccepted items
|
2025-09-16 15:52:41 -07:00 |
|
|
snipe
|
1346e33e99
|
Check that the person trying to download can see both the user and the target
|
2025-09-16 14:21:03 +01:00 |
|
|
snipe
|
ab9cc447aa
|
Use more specific filename
|
2025-09-16 14:20:20 +01:00 |
|
|
snipe
|
0bad75b263
|
Fixed declined asset name
|
2025-09-15 20:56:57 +01:00 |
|
|
snipe
|
74b98083e2
|
Override the getEula() method at the SnipeModel level
|
2025-09-15 20:05:35 +01:00 |
|
|
snipe
|
927f557672
|
Fixed sorting on updated/created at
|
2025-09-15 18:13:46 +01:00 |
|
|
snipe
|
630ea05e17
|
A little more cleanup
|
2025-09-15 17:16:05 +01:00 |
|
|
snipe
|
7df5196083
|
A little cleanup
|
2025-09-15 16:09:49 +01:00 |
|
|
snipe
|
01f7b5d709
|
Added CJK and Arabic font support
|
2025-09-15 14:46:11 +01:00 |
|
|
snipe
|
7062962cc8
|
Show warnings on the dates if expired or terminated
|
2025-09-15 13:43:08 +01:00 |
|
|
snipe
|
319cb1bd1e
|
Removed logging
|
2025-09-15 13:23:44 +01:00 |
|
|
snipe
|
58cda5ae6d
|
Added scopes
|
2025-09-15 13:22:25 +01:00 |
|
|
snipe
|
35739c2eef
|
Merge pull request #17835 from marcusmoore/feature/10052-assigned-assets-via-api
Fixed #10052 - Added api endpoint for retrieving assets checked out to asset
|
2025-09-15 08:38:35 +01:00 |
|
|
Marcus Moore
|
81eefc5448
|
Merge branch 'develop' into fixes/qty-in-component-email
|
2025-09-11 14:14:42 -07:00 |
|
|
Marcus Moore
|
082bc3ece4
|
Use correct qty in component checkout email
|
2025-09-11 14:10:31 -07:00 |
|
|
Godfrey M
|
850939367c
|
adds translation warning message
|
2025-09-10 12:59:35 -07:00 |
|
|
Marcus Moore
|
082bff2fa8
|
Add and use query scope helper
|
2025-09-09 13:04:14 -07:00 |
|
|
Marcus Moore
|
eada0b0bb5
|
Implement test
|
2025-09-09 11:58:43 -07:00 |
|
|
Marcus Moore
|
acc37045e4
|
Implement test
|
2025-09-09 11:34:50 -07:00 |
|
|
snipe
|
0004d4936c
|
Cleaned up print view
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-09 15:18:28 +01:00 |
|
|
snipe
|
7a6fdc4e0a
|
Added parent ID to location API
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-09 15:18:09 +01:00 |
|
|
snipe
|
2eb727bd0c
|
Added tests
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-09 13:51:56 +01:00 |
|
|
snipe
|
57af507170
|
Added deleted button to locations, check for additional relations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-09 12:20:34 +01:00 |
|
|
Marcus Moore
|
324070f345
|
Begin to build out test
|
2025-09-08 17:20:22 -07:00 |
|
|
snipe
|
f340390fc8
|
Merge pull request #17703 from marcusmoore/17369-accessory-checkout-qty-scaffold
Fixed issues around accessory acceptance
|
2025-09-08 09:09:26 +01:00 |
|
|
snipe
|
be81e74921
|
Shifted log meta position
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-08 08:24:50 +01:00 |
|
|
snipe
|
c5bede8594
|
More small display_name fixes
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-04 17:15:06 +01:00 |
|