DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
17140 commits 59 branches 275 tags 321 MiB
Commit graph

6715 commits

Author SHA1 Message Date
snipe 4800f4c853
Merge branch 'develop' into remove_mcrypt 2025-02-24 22:12:56 +00:00
Marcus Moore e88bba51bb
Merge branch 'develop' into acceptance-reminder-subject 2025-02-24 11:55:50 -08:00
Marcus Moore 027c2b3627
Change subject to "You have Unaccepted Assets." 2025-02-24 11:45:23 -08:00
snipe bf2355a297 Fixed showfile path 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 14:34:10 +00:00
snipe 2bf4ec0ae8 A few more small tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 14:24:15 +00:00
snipe 77b417bcea Passed user to showfile 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:43:39 +00:00
snipe a5009aa7df Added withTrashed() to handle soft deletes with RMB 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:38:06 +00:00
snipe e589adbe80 Updated model route 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-24 13:31:09 +00:00
snipe dd2b570db5 Added tighter constraints on deleting components 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-23 14:11:39 +00:00
snipe 069860d65f Added tooltip for currency in table 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-23 12:19:18 +00:00
snipe 9abf3029ef Compact the method just a little 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 19:02:41 +00:00
snipe 19fb45f488 Refactor into method 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 18:57:18 +00:00
snipe f5eedb8d23 Added RMB and include $item so the asset fields are populated 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 18:13:12 +00:00
snipe 172df0d220 Save new custom field values 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 18:12:46 +00:00
snipe c611cb5612 Updated loggable to check for custom fields that were passed for meta 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 18:12:30 +00:00
snipe bb70250007 Added select/unselect tooltip to presenters, added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 14:30:49 +00:00
snipe 346aeeda71
Merge pull request #16287 from uberbrady/better_hover_titles 
Fixes: [sc-28423] Better tooltips on lists, Bootstrap style
 2025-02-22 14:24:02 +00:00
snipe 0cd0abe8bb Fixed #16282 - adds accessories tab to assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 14:20:21 +00:00
snipe 7db11dc12b
Merge pull request #16277 from Godmartinz/bulk_delete_asset_bug 
Fixes deletion of assigned assets through bulk delete
 2025-02-22 12:59:37 +00:00
snipe e0221301ff Increased text limit on notes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 12:56:25 +00:00
snipe b0fa059a28
Merge pull request #16285 from marcusmoore/bug/sc-28148 
Re-added ability to add notes to assets
 2025-02-22 12:55:18 +00:00
snipe 7a77de6ffe Don’t delete avatar file on soft-delete 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 12:49:04 +00:00
snipe d1cc0fcfac Added ability to send user inventory via bulk UI 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 12:07:54 +00:00
snipe 7b930357e4 Cast years to int 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-22 10:51:27 +00:00
Brady Wetherington 2d1e9b237f Better tooltips on list views, in Bootstrap style 2025-02-21 13:23:19 +00:00
Brady Wetherington 38c5f23a52 Merge branch 'v8' into develop 2025-02-21 11:15:44 +00:00
Marcus Moore ae7d7f7d22
Merge branch 'develop' into bug/sc-28148 
# Conflicts:
#	routes/web.php
 2025-02-20 13:23:55 -08:00
Marcus Moore 43f679a554
Revert some changes from #15525 2025-02-20 12:59:16 -08:00
Marcus Moore f1bf9fcf5c
Implement test 2025-02-20 12:51:08 -08:00
Marcus Moore 992b4c7d86
Remove old comment 2025-02-20 12:50:03 -08:00
Marcus Moore 44503fc423
Use translation 2025-02-20 12:41:56 -08:00
snipe 5b63eb5a15
Merge pull request #16272 from snipe/experiments/breadcrumbs
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Experimental WIP - added breadcrumbs, route model binding for resource routes
 2025-02-20 19:21:58 +00:00
snipe e0beed0fa3 Reapplied accessory gate 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 18:28:01 +00:00
snipe d4b24e5e57 Exception handler exceptions - exception inception! 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 18:27:45 +00:00
snipe 44a7bdbfb5 Moved SAML gui settings routes to web.php 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:58:17 +00:00
snipe 0341335d14 Additional crombs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:57:48 +00:00
snipe 76f038d142 RMB for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:57:18 +00:00
snipe 3150ad50c9 RMB for audits 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 14:57:07 +00:00
snipe 80394ef788 Revert delete because route model binding + resources routes + soft deletes = sux0r 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 12:29:37 +00:00
snipe 8a70f09dd3 Temp “fix” RMB for soft-deleted users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-20 12:19:31 +00:00
Godfrey M a275391557 adds test for deleting assigned asset 2025-02-19 15:59:57 -08:00
Godfrey M eaacf29d57 fix tests 2025-02-19 15:11:16 -08:00
Marcus Moore 759c8c8f5c
Catch TypeError in addition to Exceptions when rendering barcodes 2025-02-19 12:36:50 -08:00
snipe 6242296930 Remove the “View” part of the breadcrumb 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 19:30:13 +00:00
snipe d330ef9919 Added crumbs and RMB for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 18:23:16 +00:00
Godfrey M a534b488b2 prevents deletion of assigned assets in bulk deletion 2025-02-19 10:09:02 -08:00
snipe 292819afa5 Added maintenances crumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:29:06 +00:00
snipe 6b46d12d67 Added breadcrumbs on kits (sort of) 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:05:29 +00:00
snipe 4d72fd8667 Added additional resource crumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:03:53 +00:00
snipe fca62a14f9 Fixed asset presenter to link to the company directly 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:03:29 +00:00
snipe c8f2d9806a Use route model binding on kits 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:03:15 +00:00
snipe 1ee5f28fca Added angle-right and house icon 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:02:59 +00:00
snipe 24a17b09a5 Fixed a few more tests and strings 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 09:03:41 +00:00
snipe a617c0545e WIP license checkin 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:39:25 +00:00
snipe eb7e24eeb0 Asset checkout with route model binding 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:39:16 +00:00
snipe 22c58678c4 License checkout controller with route model binding 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:38:55 +00:00
snipe 4beaf6b3ec Added item 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:38:40 +00:00
snipe 63f4e3cc89 More breadcrumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 08:36:52 +00:00
snipe cd7135ea77 More test fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 06:19:50 +00:00
snipe 347eb2bdee Fixed route parameters and tests to match 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 05:03:56 +00:00
snipe ecc0e76e7b Fixed route parameters for helper 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 05:03:39 +00:00
snipe 35a89de6dd Fixed handler for reports 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 05:03:26 +00:00
snipe 82d8e1b0a9 Added item back into edit 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 04:18:57 +00:00
snipe 5a7ffa5664 Sure, whatever I guess. 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 04:18:40 +00:00
snipe 55abd242f2 Don’t know why I need to compact this? 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 04:07:09 +00:00
snipe 217d65f64c More changes to the error message formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 03:47:51 +00:00
snipe fa20eb4965 Add exception for hardware vs assets :( 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 03:41:01 +00:00
snipe 560311b883 Added ->with(‘item’) back in 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 03:37:34 +00:00
snipe 3954ff20b4 More tweaks to the controllers, more breadcrumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 03:29:31 +00:00
snipe 989082d719 Handle the not found errors with route model binding 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 03:26:44 +00:00
snipe 644527c5a6 More resources to breadcrumb provider 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 02:49:21 +00:00
snipe f7d213052a Route model binding for resource groups 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 02:49:05 +00:00
snipe 972bd1ef83 Tinkering with routes for breadcrumbs 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 00:37:09 +00:00
Marcus Moore cf0ce1c5ea
Start to implement tests 2025-02-18 16:24:52 -08:00
Marcus Moore 1995e1399e
Start recording ip, user agent, and source 2025-02-18 16:04:53 -08:00
Marcus Moore 79d1147f20
Add validation 2025-02-18 15:46:52 -08:00
Marcus Moore 53c084c6c0
WIP: begin to store notes 2025-02-18 15:43:58 -08:00
Marcus Moore 25215fd3c9
WIP: begin migrating notes to ui controller 2025-02-18 15:20:06 -08:00
Brady Wetherington a8231bc338 Merge branch 'develop' into v8 2025-02-18 22:40:27 +00:00
snipe 1fe170e6a1
Merge pull request #16040 from Godmartinz/template_validate_error
Some checks failed
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Details
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Details
Docker images (Alpine) / docker (push) Has been cancelled
Details
Docker images / docker (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Details 
Adds a null check to label templates, adds return types for validation methods
 2025-02-18 21:00:10 +00:00
snipe 329fbf6a7c Scope results by location ID 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 19:01:16 +00:00
snipe 48ab94c15b Fixed query duplication for AssetsForShow scope 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-18 16:18:12 +00:00
snipe 452185be45
Merge pull request #16199 from akemidx/feature/sc-28271 
Adding <Last Name.First Initial> as an option for usernames
 2025-02-18 14:42:54 +00:00
Brady Wetherington 14feed61d8 Merge branch 'develop' into v8 2025-02-17 16:18:02 +00:00
snipe 7553ec3e27 Fixed equals 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-17 10:44:58 +00:00
Godfrey M 25c8449e86 remove unused 2025-02-13 11:14:18 -08:00
Godfrey M 13e1f4a127 adds mailable 2025-02-13 11:09:39 -08:00
Godfrey M ed96fd766c refactors audit notification to mail, adds test, ads check to scheduler 2025-02-13 11:08:53 -08:00
snipe c8f82cbc2b
Merge pull request #16250 from uberbrady/improve_tls_client_side_file_caching 
Instead of saving TLS cache-files on save, cache them when used
 2025-02-13 15:46:22 +00:00
Brady Wetherington b7bd56daf7 Instead of saving TLS cache-files on save, cache them when used 2025-02-13 15:09:28 +00:00
snipe d3210c6d40 Return flat JSON instead of transformed data 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-13 14:16:32 +00:00
snipe ff1157a95e
Merge pull request #16232 from Godmartinz/adds-expiring-notifications 
Expiration notifcation switched to use Mailable
 2025-02-12 20:07:24 +00:00
Godfrey M e66b690c93 removed unnecessary base_path changes 2025-02-12 12:01:43 -08:00
Godfrey M 6873244e7e adds test for expiring asset notifications 2025-02-12 11:28:36 -08:00
Godfrey M 9b5b58687d removed unused 2025-02-11 11:02:25 -08:00
Godfrey M fb7bec4be4 adds expiring asset and license mail 2025-02-11 10:55:56 -08:00
snipe 63cb4e70bc Added notes to presenters 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:34:10 +00:00
snipe e6ae9cae6b Added notes to searchable and fillable attributes 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:33:51 +00:00
snipe 1f1e1401cf Added location notes to importer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:32:58 +00:00
snipe af1159658d Added notes to transformers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:32:37 +00:00