DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
16520 commits 52 branches 269 tags 311 MiB
Commit graph

16520 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 3caa5f2042 Fixed user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 5226d507d4 Updated route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:35:34 +00:00
snipe 274b659905 Added new route 
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 36aea52ae0 Fixed variable in test 
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 27fab0f573 Use history icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 16:34:51 +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
snipe 1e7d7a147b
Merge pull request #15972 from snipe/upgrade_fontawesome 
Updated font awesome
 2024-12-16 15:55:14 +00:00
snipe 8ee549efbf Bumped font-awesome to 6.7.0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-16 15:51:23 +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 d1246c65bd
Merge pull request #15963 from snipe/localization/updated_strings_2024-12-12
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
2024-12-12 19:24:09 +00:00
snipe 38db890660 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-12 19:22:56 +00:00
snipe 01c18f6303
Merge pull request #15962 from snipe/fixes_rb-18772
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
2024-12-12 17:40:40 +00:00
snipe c5e2aed164 Check for assigned (not assigned_to) before trying to present() the name on bulk delete assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-12 17:37:08 +00:00
snipe 4d1d2fedb7
Merge pull request #15960 from uberbrady/improve_restore_cleaner_utf8 2024-12-12 17:05:10 +00:00
snipe ab6363a124
Merge pull request #15959 from snipe/remove_settings_api_endpoints 2024-12-12 16:53:15 +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
snipe da33f1815a Removed index and destroy settinga API endpoints 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-12 16:46:19 +00:00
snipe f089d1f0a4
Merge pull request #15944 from marcusmoore/bug/required-display-for-selects
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
2024-12-12 01:42:26 +00:00
spencerrlongg 72f58b0405 leaving this here for notes etc 2024-12-11 19:13:51 -06:00
snipe 4bd6c2171c
Merge pull request #15957 from Godmartinz/fix-checkout-notif-parameters 2024-12-12 00:38:21 +00:00
Marcus Moore 67494c1b0b
Fix validation messages for select2 inputs 2024-12-11 16:26:23 -08:00
Godfrey M 3264149a2c fix other mailables 2024-12-11 16:26:18 -08:00
Marcus Moore 8417fcb604
Revert "Show frontend "required" validation for model and status selects" 
This reverts commit 10a7ae8d47.
 2024-12-11 16:25:45 -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 a7e6b8ea3f
Merge pull request #15956 from marcusmoore/bug/sc-27731 2024-12-11 23:52:33 +00:00
Marcus Moore 6e31d0f2c3
Use appropriate category for licenses when seeding 2024-12-11 15:39:41 -08:00
snipe b9a660683c
Merge pull request #15955 from ubc-cpsc/bugfix/GHSA-c2pc-g5qf-rfrf
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
2024-12-11 20:42:13 +00:00