DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-31 16:37:27 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15733 commits 102 branches 268 tags 289 MiB
Commit graph

15733 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 15ffd69ac0 Merge remote-tracking branch 'origin/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
2024-10-24 01:40:10 +01:00
snipe e0ec6795b5 Use crucial for seeded data
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-10-24 01:27:50 +01:00
snipe 5509d756b7
Merge pull request #15722 from Godmartinz/fix_component_factory 
Fixed Component Factory: use manufacturer factory for `manufactuer_id`
 2024-10-24 01:12:11 +01:00
Godfrey M b16a978f1b uses manufacturer factory for manufactuer_id 2024-10-23 16:25:51 -07:00
snipe 7bbe23995d Merge remote-tracking branch 'origin/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
2024-10-23 19:14:36 +01:00
snipe 55ba6279a4 Use trans_choice on alert menu
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-10-23 19:14:17 +01:00
snipe a9eea830e3 Added manufacturer and model number to component seeders 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-23 19:05:34 +01:00
snipe 574f2e096d Merge remote-tracking branch 'origin/develop' 2024-10-23 17:57:37 +01:00
snipe af564935d5
Merge pull request #15720 from snipe/15695_adds_manufacturer_and_model_number_to_components 
Fixed #15695 - Added manufacturer and model_number to components
 2024-10-23 17:56:04 +01:00
snipe 3ee76be7e3 Added manufacturer and model_number to components 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-23 17:50:22 +01:00
snipe e15e33b648 Merge remote-tracking branch 'origin/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
2024-10-23 15:14:29 +01:00
snipe d58f87862c
Merge pull request #15719 from snipe/#15717_adds_qty_to_consumable
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 #15717 - Added ability to checkout consumables in variable qty via API
 2024-10-23 15:09:50 +01:00
snipe 0b6859c491 Added ability to checkout consumables in variable qty 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-23 15:05:35 +01:00
snipe 1979ada656 Merge remote-tracking branch 'origin/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
2024-10-22 22:10:53 +01:00
snipe 5da3ce3564
Merge pull request #15711 from marcusmoore/fixes/custom-fieldset-checkboxes
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 custom field checkboxes on asset edit page
 2024-10-22 22:10:20 +01:00
snipe c536dbc741 Merge remote-tracking branch 'origin/develop' 2024-10-22 22:08:59 +01:00
snipe c3bbca30ad
Merge pull request #15710 from snipe/fixes_lightbox_for_avif 
Fixes #15701 - load avif files properly in lightbox
 2024-10-22 22:07:50 +01:00
snipe 37f14fff3b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-22 22:07:28 +01:00
snipe eb6c51fabd Fixes #15701 - load avif files properly in lightbox 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-22 22:04:57 +01:00
Marcus Moore 5ecd2b6293
Default checkbox elements to an empty array 2024-10-22 14:04:05 -07:00
snipe dccb788a88
Merge pull request #15691 from marcusmoore/fixes/get-id-for-current-user 
Updated `Company::getIdForCurrentUser()` to return null in certain scenarios
 2024-10-22 17:44:30 +01:00
Marcus Moore d10fe77ee7
Merge branch 'develop' into fixes/get-id-for-current-user 2024-10-22 09:38:31 -07:00
snipe 7774dd0b7d Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-10-22 16:53:47 +01:00
snipe 5e1d792bba
Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing 
Fixed #15686: Corrected capitalization for dashboard section titles by removing strtolower()
 2024-10-22 16:52:28 +01:00
snipe 9cf71976f6 Fixed #15706 - Removed purchase order number from asset import 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-22 16:51:42 +01:00
snipe 15745d9737
Merge pull request #15566 from Godmartinz/status-label-error-message 
Fixed Status Labels Error Message
 2024-10-22 16:39:44 +01:00
snipe bd97955b9e Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-22 16:38:46 +01:00
snipe 252d99421c
Merge pull request #15689 from snipe/better_handle_inline_files 
Better handle inline files in file listing
 2024-10-22 16:26:48 +01:00
snipe 5767a98ad8
Merge pull request #15649 from bryanlopezinc/ImproveImporting 
Improve import performance
 2024-10-22 16:26:23 +01:00
snipe 0c820cbc0d
Merge pull request #15598 from spencerrlongg/bug/custom_field_validation_issue 
Custom Field Existence Validation Issue
 2024-10-22 15:56:12 +01:00
snipe db81701621
Merge branch 'develop' into better_handle_inline_files 2024-10-22 15:44:24 +01:00
snipe a05c33febf Squashed commit of the following: 
commit 147fcfb8eb
Merge: 58a3d09b5 fdcc17ca2
Author: snipe <snipe@snipe.net>
Date:   Tue Oct 22 15:12:55 2024 +0100

    Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs

    Fix user creation with FullMultipleCompanySupport enabled over API

commit 58a3d09b5f
Merge: 30a06a594 867fa2f36
Author: snipe <snipe@snipe.net>
Date:   Tue Oct 22 14:55:42 2024 +0100

    Merge pull request #15703 from marcusmoore/bug/sc-27188

    Linked accessory files in activity report

commit 30a06a5942
Merge: 6c6af78e0 ce3086317
Author: snipe <snipe@snipe.net>
Date:   Tue Oct 22 11:47:06 2024 +0100

    Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing

    Removed brianium/paratest

commit 6c6af78e08
Merge: 9b06bbb6c 3f79fd7ea
Author: snipe <snipe@snipe.net>
Date:   Tue Oct 22 11:46:04 2024 +0100

    Merge pull request #15705 from marcusmoore/tests/icon-component-test

    Added test to ensure icon component does not end in newline

commit 3f79fd7ea7
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Oct 21 17:07:40 2024 -0700

    Add test to ensure icon component does not end in newline

commit 9b06bbb6c3
Merge: 46ad1d072 d7f70146f
Author: snipe <snipe@snipe.net>
Date:   Mon Oct 21 22:38:26 2024 +0100

    Merge pull request #15704 from marcusmoore/bug/remove-extra-icon

    Removed second icon in accessory file list

commit ce30863177
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Oct 21 13:57:04 2024 -0700

    Remove brianium/paratest dependency

commit d7f70146f4
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Oct 21 13:48:25 2024 -0700

    Remove extra icon in accessory file upload list

commit 867fa2f36e
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Mon Oct 21 12:40:24 2024 -0700

    Display file in activity report for accessories

commit 0933a2d4ea
Author: Marcus Moore <contact@marcusmoore.io>
Date:   Thu Oct 17 18:01:48 2024 -0700

    Remove --parallel flag

commit 46ad1d072f
Merge: bcb4bd9eb 3cf746d7d
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 17 15:29:47 2024 +0100

    Merge pull request #15680 from uberbrady/bulk_checkout_to_bulk_actions

    Bulk checkout to bulk actions

commit bcb4bd9eb4
Merge: 250037540 f50ccbcc4
Author: snipe <snipe@snipe.net>
Date:   Thu Oct 17 10:20:13 2024 +0100

    Merge pull request #15683 from Toreg87/fixes/outdated_comment

    Fix outdated comment in CompanyableTrait

commit f50ccbcc49
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date:   Thu Oct 17 11:07:28 2024 +0200

    Fix outdated comment in CompanyableTrait

    As of commit 5800e8d the user model uses CompanyableTrait so remove this clearly outdated comment

commit 3cf746d7df
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Wed Oct 16 23:13:32 2024 +0100

    Rework the bulk checkout to not change how all checkouts work

commit 6b7af802af
Author: Brady Wetherington <bwetherington@grokability.com>
Date:   Thu Oct 10 13:28:23 2024 +0100

    Add 'bulk checkout' as one of the bulk actions in the bulk actions toolbar

commit fdcc17ca2c
Author: Tobias Regnery <tobias.regnery@gmail.com>
Date:   Wed Oct 16 11:18:24 2024 +0200

    Fix user creation with FullMultipleCompanySupport enabled over API

    It is currently possible as a non-superuser to create a new user or patch an existing user with arbitrary company over the API if FullMultipleCompanySupport is enabled.
    Altough a highly unlikely scenario as the user needs permission to create API keys and new users, it is a bug that should get fixed.

    Add a call to getIdForCurrentUser() to normalize the company_id if FullMultipleCompanySupport is enabled.

Signed-off-by: snipe <snipe@snipe.net>
 2024-10-22 15:43:19 +01:00
snipe 03b01689b5 Merge remote-tracking branch 'origin/develop' 2024-10-22 15:39:20 +01:00
snipe 147fcfb8eb
Merge pull request #15676 from Toreg87/fixes/api_create_user_fmcs
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 
Fix user creation with FullMultipleCompanySupport enabled over API
 2024-10-22 15:12:55 +01:00
snipe 58a3d09b5f
Merge pull request #15703 from marcusmoore/bug/sc-27188 
Linked accessory files in activity report
 2024-10-22 14:55:42 +01:00
snipe 30a06a5942
Merge pull request #15693 from marcusmoore/chore/remove-parallel-testing 
Removed brianium/paratest
 2024-10-22 11:47:06 +01:00
snipe 6c6af78e08
Merge pull request #15705 from marcusmoore/tests/icon-component-test 
Added test to ensure icon component does not end in newline
 2024-10-22 11:46:04 +01:00
Marcus Moore 3f79fd7ea7
Add test to ensure icon component does not end in newline 2024-10-21 17:07:40 -07:00
snipe 9b06bbb6c3
Merge pull request #15704 from marcusmoore/bug/remove-extra-icon
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 
Removed second icon in accessory file list
 2024-10-21 22:38:26 +01:00
Marcus Moore ce30863177
Remove brianium/paratest dependency 2024-10-21 13:57:04 -07:00
Marcus Moore d7f70146f4
Remove extra icon in accessory file upload list 2024-10-21 13:48:25 -07:00
Marcus Moore 867fa2f36e
Display file in activity report for accessories 2024-10-21 12:40:24 -07:00
Marcus Moore e1882ee6d2
Add comment 2024-10-21 12:21:45 -07:00
Marcus Moore 7eee239378
use is_numeric instead of is_int 2024-10-21 12:20:28 -07:00
Marcus Moore 4188849ae1
Add failing test case 2024-10-21 12:19:48 -07:00
snipe 787e651778 Fixed todos with log message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 16:52:21 +01:00
snipe ef9b6e3b07 Code cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 16:34:54 +01:00
snipe 06c599cc17 Added method to show or download file 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 16:34:03 +01:00
snipe 6105323877 Use plural class name for src 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-21 14:11:20 +01:00
Marcus Moore 0933a2d4ea
Remove --parallel flag 2024-10-17 18:01:48 -07:00