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
17122 commits 59 branches 275 tags 321 MiB
Commit graph

4273 commits

Author SHA1 Message Date
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 c8f2d9806a Use route model binding on kits 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-19 14:03:15 +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 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 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 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 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
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 7553ec3e27 Fixed equals 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-17 10:44:58 +00: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 af1159658d Added notes to transformers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:32:37 +00:00
snipe 4e2b22135a Added notes to UI controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:32:07 +00:00
snipe 4ee5a4c5c3 Added notes to API controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-11 00:31:50 +00:00
snipe c420670ebb Small fixes to accessories files handling 
Signed-off-by: snipe <snipe@snipe.net>
 2025-02-10 22:26:00 +00:00
Brady Wetherington de3ebfecfe Ensure we don't call preg_split() with a null as the second parameter 2025-02-06 13:24:39 +00:00
Godfrey M ddc22b4d6b adds a check to see that qr code type is not none 2025-02-03 10:38:49 -08:00
Marcus Moore ab9e9b66d2
Reduce complexity 2025-01-29 16:27:18 -08:00
Marcus Moore c15c338ffd
Merge if/else 2025-01-29 16:25:37 -08:00
Marcus Moore e2805f4033
Add "Reminder" to subject line 2025-01-29 15:36:45 -08:00
Marcus Moore 1098b8cd9d
Avoid trying to divide by zero 2025-01-22 10:21:30 -08:00
snipe d5309c7d94 Added fragment to uploads for redirect 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-21 18:06:00 +00:00
snipe 0d7304eb8b Use transformer for model files 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-20 20:20:35 +00:00
snipe 67ab602e3b
Merge pull request #16090 from snipe/fixes/s3_support_for_eulas 
Fixed #16000 - add S3 support for eula PDF downloads
 2025-01-20 16:26:11 +00:00
snipe 446c7fb483
Merge pull request #16096 from uberbrady/detect_csv_encodings_v2 2025-01-20 14:42:07 +00:00
Brady Wetherington bbb2af7f53 remove log messages 2025-01-20 13:52:26 +00:00
Brady Wetherington d65206c7fe Move tests to UI-side 2025-01-20 13:49:42 +00:00
snipe e9ad43afbe Better hide reset password functionality for LDAP users 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 18:51:08 +00:00
snipe 434068a2ed Fixes #16000 - add S3 support for eula PDF downloads 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 17:49:19 +00:00
snipe 57f80290a1
Merge pull request #16081 from marcusmoore/fixes/zerofill-count-on-setup
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details
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
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details
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
Some checks are pending
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:28:50 +00:00
Godfrey M 69d255f584 adds validation rules for label names 2025-01-14 12:07:59 -08:00
Godfrey M 3ac0877418 remove try/catch, add rules for template 2025-01-14 09:50:43 -08: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
Some checks failed
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
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
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
Godfrey M 0118504cd3 adds redirect to render and save if template is null 2025-01-08 15:32:23 -08: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
Marcus Moore 48dd3252cb
Fix parameter order 2025-01-07 11:47:16 -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
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 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
Some checks are pending
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Details
Docker images (Alpine) / docker (push) Waiting to run
Details
Docker images / docker (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Details
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Details
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Details 
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
spencerrlongg 7eb936883a rm note 2024-12-17 16:38:29 -06:00
akemidx c3b5a92a48 added builder 2024-12-17 17:11:52 -05:00
spencerrlongg eb054897d6 Remove leftover testing logic and fix checkout permissions 
Removed console logs and temporary testing code from the bootstrap-table view. Updated the transformer to correctly check checkout permissions against the Asset class instead of PredefinedKit.
 2024-12-17 16:06:10 -06:00
akemidx f6dbda4056 fixing count to not used trashed 2024-12-17 17:03:46 -05:00
akemidx 5992d2a1d2 adding to controller 2024-12-17 15:43:13 -05:00
Marcus Moore 7aa5195e87
Add tests for license checkin 2024-12-16 14:39:24 -08:00
snipe b233715796 Fixed property 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe b93fc80011 Fixed admin -> adminuser property 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 51b426f0b4 Added accessory transformer to assets transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 021c4f2598 Added assets endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe ac96b8d4ae Added assignedAccessories method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe bc8719e336 Specify created_by in the API call as well 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe bd38d64e66 Removed create() method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 74b5d6d12b Updated transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe ddd11939a5 No need to include assigned_to 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 3caa5f2042 Fixed user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe a0b9714d72 Updated user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 183a4d49d8 Refactor of #15235 - added accessory checkout to locations, assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:34:49 +00:00
Marcus Moore 699476da90
Scaffold and implement some license checkin tests 2024-12-12 17:33:34 -08:00
Marcus Moore d763feb803
Add consumable ui tests 2024-12-12 16:41:46 -08:00
Marcus Moore d3bfa75251
Add accessory ui tests 2024-12-12 14:30:58 -08:00