DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
16575 commits 53 branches 269 tags 314 MiB
Commit graph

16575 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 48dd3252cb
Fix parameter order 2025-01-07 11:47:16 -08:00
snipe ee6f60e63c
Merge pull request #16034 from Godmartinz/fix-locale-check
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-07 19:00:32 +00:00
Godfrey M f6abf90ba0 fix locale check 2025-01-07 10:51:48 -08:00
Godfrey M 83ee0e0fb6 untangled code visibility from each label engine 2025-01-07 10:37:59 -08:00
Godfrey M 94f44d1b77 fix label type values in db and defaults. update help text 2025-01-07 10:00:52 -08:00
Godfrey M e12c7473f8 tinkering with the polymorphic eager load 2025-01-07 09:08:36 -08:00
snipe 407d69b370
Merge pull request #16031 from snipe/make_backups_more_configurable
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-07 11:25:17 +00:00
snipe 774e795d97 Pull backup:clean settings into config 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-07 11:17:43 +00:00
snipe f698f74d3e
Merge pull request #16028 from marcusmoore/fixes/report-template-column
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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details 
Fixed migration causing issues with mariadb
 2025-01-06 22:58:30 +00:00
Marcus Moore 80f9159f4d
Change options to text type 2025-01-06 14:29:18 -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 4d3db2ab44
Merge pull request #15919 from Godmartinz/table_dropdownmenu-fix
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
CodeQL Security Scan / CodeQL Security Scan (javascript) (push) Waiting to run
Details
Codacy Security Scan / Codacy Security Scan (push) Waiting to run
Details 
Removed the `table-responsive` div from several index blades
 2025-01-06 18:11:19 +00:00
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
aHVzY2g eba1f03363
Added: TZe_24mm_D.php modified TZe_24mm_A that includes 1D code 
New label format for TZe_24mm that includes all fields of TZe_24mm_A with the addition of the 1D code at the bottom of the label.
 2025-01-03 11:10:44 +01: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
Anouar Touati e33c680679 Improvement: Change the logging channel to storage/logs/laravel.log file in dev container 2024-12-29 11:13:47 -05:00
Anouar Touati 1e8ec783b4 following docs for prod docker without specifying APP_VERSION will now get latest version as doc says 2024-12-29 11:05:02 -05:00
Anouar Touati a6ed958687 Fixed: dev dependencies are not installed in dev container 2024-12-29 11:02:09 -05:00
Anouar Touati 4354f50168 Fixed: Debug mode is not enabled in dev container 2024-12-29 11:02:09 -05: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
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