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 1 Packages Projects Releases Wiki Activity
16812 commits 59 branches 275 tags 321 MiB
Commit graph

6588 commits

Author SHA1 Message Date
snipe 0d7304eb8b Use transformer for model files 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-20 20:20:35 +00:00
snipe 5afcd8ddb3
Merge pull request #16099 from snipe/add_id_to_locations_importer
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 
Fixed #16097 - added location ID to location importer
 2025-01-20 16:58:24 +00:00
snipe 5273408631 Check for matching ID 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-20 16:53:48 +00:00
snipe 713c9fdd6f Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-20 16:46:22 +00:00
snipe 0a5c41ce23 Log error 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-20 16:42:53 +00:00
snipe 48a916ab77 Check that the ID has a value 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-20 16:38:31 +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 801328ec42 Fixed #16097 - allow location update by ID in importer 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-20 16:23:13 +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 79951c3f17 Set support footer to on in reset demo script 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 16:37:00 +00:00
snipe 221ffb446c Fixed #15946 - added comtent type to webhook test 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 16:36:43 +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
Brady Wetherington a50c8c6269 Automatically detect character encoding of CSV files when processsing them 
to handle non-UTF-8 file types. Added a new test case and enhanced the test
rigs to be able to write non-UTF-8 files.

Final cleanup
 2025-01-16 17:03:37 +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 9a4fd81c70 Use correct icon for ad-hoc notes on assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-14 14:34:17 +00: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
snipe 06ffac9d7d
Merge pull request #16046 from uberbrady/ldap_asset_location_switch_fix 2025-01-13 17:33:13 +00:00
Nebel 9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode 2025-01-13 15:49:32 +01:00
snipe 41da04cd22
Merge pull request #16018 from aHVzY2g/patch-3 2025-01-13 13:55:04 +00:00
Marlon Spangenberg 0c4fc56b80 increased label/field size to 2.5, reduced supported fields to 3 2025-01-13 12:20:56 +01:00
Marlon Spangenberg 907f0553d4 moved label value into the same line, changed label font to freemono 2025-01-13 12:14:30 +01:00
Godfrey M 001ccf1ce9 adds translation string instead of hardcoded message 2025-01-09 14:47:07 -08:00
Godfrey M 082a974ee3 changed from redirect with error to with warning 2025-01-09 14:26:54 -08:00
Godfrey M 152c23b8f3 changed log from warning to error 2025-01-09 12:55:25 -08:00
Godfrey M b635822a85 add try/catch around notification failing for inactive slack hooks 2025-01-09 12:51:54 -08:00
Brady Wetherington 049b9c542b Conditionally update assets when user's location moves via LDAP 2025-01-09 13:43:59 +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 f4e69679ca add a try catch around template validation 2025-01-08 12:13:31 -08:00
Godfrey M ce7a8ad808 add a space 2025-01-08 09:48:45 -08:00
Godfrey M c17c011488 checks if template is null, adds return types for validation methods 2025-01-08 09:47:20 -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
snipe 40b41e646d
Merge pull request #16033 from Godmartinz/barcode-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
2025-01-07 19:59:30 +00:00
snipe 63853db450
Merge pull request #16035 from marcusmoore/fixes/unaccepted-assets-reminder 2025-01-07 19:58:23 +00:00
Marcus Moore 48dd3252cb
Fix parameter order 2025-01-07 11:47:16 -08: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
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
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 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
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 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 e0643cd744 Added currency and history icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:30 +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
snipe edacc4eb54
Merge pull request #15446 from Godmartinz/barcode_settings_hide
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 
Refactored Barcode Settings into Label Settings
 2024-12-16 16:09:34 +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
Godfrey M 833af55806 Merge branch 'develop' into barcode_settings_hide 2024-12-12 12:05:29 -08:00
snipe 4d1d2fedb7
Merge pull request #15960 from uberbrady/improve_restore_cleaner_utf8 2024-12-12 17:05:10 +00:00
Brady Wetherington a0e7dcf4ff Fixes to 'clean' mode to better handle character sets and zero-values 2024-12-12 16:50:36 +00:00
Godfrey M 3264149a2c fix other mailables 2024-12-11 16:26:18 -08:00
Godfrey M 331fbb66bd fix other mailables 2024-12-11 16:25:04 -08:00
Godfrey M 400833f834 reversed order of the acceptance and note paramter 2024-12-11 16:14:06 -08:00
snipe 06a0ac895d Fixed #15928 - updated method name to setCreatedBy from SetUserId
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>
 2024-12-11 18:34:18 +00:00
snipe f5a9e4bafa Fixes #15952 - fixed typo in content-type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-11 18:09:19 +00:00