DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-11 13:57:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
16435 commits 103 branches 268 tags 292 MiB
Commit graph

16435 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe c3d52af546
Merge pull request #16024 from snipe/fixes/#15977 
Fixed  #15977 - Set order by on companies
 2025-01-06 16:12:42 +00:00
snipe 9672a13402 Set order by on companies 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-06 16:11:18 +00:00
snipe 9564f7fdb8 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-06 12:46:17 +00:00
snipe c7ca4d061f
Merge pull request #16013 from ubc-cpsc/bugfix/CVE-2024-56521-tcpdf
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 
Fixes tecnickcom/tcpdf security CVEs
 2024-12-30 23:22:32 +00:00
Joël Pittet 115f08ee49 Fixes tecnickcom/tcpdf security CVES: CVE-2024-56522, CVE-2024-56527, CVE-2024-56519, CVE-2024-56521 2024-12-30 13:59:03 -08:00
snipe 8fc1227974
Merge pull request #16003 from snipe/asset_maintenance_api_fix
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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Details
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Details 
Check for valid asset before accessing properties
 2024-12-26 10:31:47 +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 3edb501973 Fixed typo sanitze to sanitize
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 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-25 20:45:19 +00:00
snipe 49918d3302
Merge pull request #15992 from marcusmoore/fixes/reset-demo-command
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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Has been cancelled
Details
Codacy Security Scan / Codacy Security Scan (push) Has been cancelled
Details 
Fixed reset demo command
 2024-12-19 23:24:37 +00:00
Marcus Moore 876ab44a16
Update settings property keys 2024-12-19 15:18:27 -08: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 23af5fb06e
Merge pull request #15964 from marcusmoore/testing/accessories-ui 
Added Accessory UI tests
 2024-12-19 22:40:34 +00:00
snipe 6b8c1eb523
Merge branch 'develop' into testing/accessories-ui 2024-12-19 22:38:04 +00:00
snipe 0984194ec6
Merge pull request #15965 from marcusmoore/testing/consumable-ui 
Added Consumable UI tests
 2024-12-19 22:36:47 +00:00
snipe 26264e1d55
Merge branch 'develop' into testing/consumable-ui 2024-12-19 22:34:10 +00:00
snipe dc5dedd5a3
Merge pull request #15975 from marcusmoore/testing/license-checkin 
Added tests around license checkin
 2024-12-19 22:33:03 +00:00
snipe d49bfb562a
Merge branch 'develop' into testing/license-checkin 2024-12-19 22:29:31 +00:00
snipe f90dd9d74d
Merge pull request #15976 from marcusmoore/testing/ui-render 
Added simple front end render tests
 2024-12-19 22:27:35 +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 174a01cb6b
Merge pull request #15991 from snipe/added_some_sorting_on_audit_report 
Added a few order options on audit report
 2024-12-19 22:24:57 +00:00
snipe 360e0ff534 Added a few order options on audit report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-19 22:19:33 +00:00
snipe 4f2721e93f
Merge pull request #15986 from Godmartinz/fix-settings-seeder 
Renames variables to match columns for label settings
 2024-12-19 19:06:28 +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
Godfrey M c8f280ac90 change barcode column names in seeder 2024-12-18 09:50:55 -08:00
spencerrlongg 7eb936883a rm note 2024-12-17 16:38:29 -06: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
Marcus Moore a53976967a
Use correct id 2024-12-17 10:31:35 -08:00
Marcus Moore 1be7508340
Add simple tests to ensure views render 2024-12-16 17:45:10 -08:00
Marcus Moore af135fa42c
Add permissions property to group factory 2024-12-16 17:37:58 -08:00
Marcus Moore 7aa5195e87
Add tests for license checkin 2024-12-16 14:39:24 -08:00
snipe 04c3481734
Merge pull request #15973 from uberbrady/next_try_accessories_to_locations_rebased
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 
Next try accessories to locations rebased
 2024-12-16 20:25:25 +00:00
Brady Wetherington 582b462326 Removed inadvertently added files. 2024-12-16 16:55:54 +00: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 41a6b34768 Added new test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 17a6a871ae Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 5fceef1dc3 Updated routes with new endpoints 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 9b04d2e51c Updated route in view 
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