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
16143 commits 103 branches 268 tags 292 MiB
Commit graph

16143 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
spencerrlongg 72f58b0405 leaving this here for notes etc 2024-12-11 19:13:51 -06:00
spencerrlongg 03c90d7b60 note, will come back to this once question is answered 2024-12-09 13:29:06 -06:00
snipe a0bab70def
Merge pull request #15939 from uberbrady/fix_ldap_asset_location_updater
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-09 17:56:23 +00:00
Brady Wetherington b5c8251539 Only update asset locations to assets checked out to users. 2024-12-09 17:40:10 +00:00
snipe 0149ed75fd
Merge pull request #15565 from spencerrlongg/bug/sc-25921 2024-12-09 17:00:10 +00:00
snipe f72635955d
Merge pull request #15925 from Godmartinz/refactor-unaccepted-assets-reminder-notif 2024-12-09 16:40:21 +00:00
Godfrey M 5120cddda4 delete notification version of reminder 2024-12-05 16:02:55 -08:00
Godfrey M 97398f1e68 adds testing to unaccepted reminder command 2024-12-05 12:41:33 -08:00
Godfrey M 281ff6ad5d wrap comment 2024-12-05 11:52:34 -08:00
Godfrey M 9d49b01958 cleans up the Unaccepted Asset reminder variables 2024-12-05 11:46:56 -08:00
Godfrey M 3f8916ea2e fix duplicate emails being sent in unaccepted reminder command 2024-12-05 11:37:03 -08:00
Godfrey M 52b051e940 add mail class for unaccepted assets reminders 2024-12-05 10:08:39 -08:00
snipe a137e31797
Merge pull request #15920 from akemidx/asset-category-in-emails
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-04 21:46:43 +00:00
akemidx ca0f8ace99 fixed 2024-12-03 16:57:28 -05:00
akemidx 6252f0ac5e layout / added category id 2024-12-03 16:10:42 -05:00
snipe 43d66a8fcc
Merge pull request #15918 from Godmartinz/mail_name_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 
Adds `MAIL_FROM_NAME` to mail envelope
 2024-12-03 17:17:26 +00:00
Godfrey M e5284c03e2 fix typo 2024-12-03 09:10:50 -08:00
Godfrey M 16283b8fc0 adds mail from name to mail envelope 2024-12-03 09:08:39 -08:00
snipe 2ad1407d51
Merge pull request #15909 from Godmartinz/checkin-out-notifications
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 general webhook option notifications not firing
 2024-12-02 22:03:32 +00:00
snipe 14730184c9 Fixed sr-only blank text 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 18:48:02 +00:00
snipe 8ff099e802
Merge pull request #15910 from marcusmoore/chore/include-testing-variable 
Included MAIL_FROM_ADDR in phpunit configuration
 2024-12-02 18:34:08 +00:00
Marcus Moore ea1f8328b9
Include MAIL_FROM_ADDR in phpunit configuration 2024-12-02 10:23:02 -08:00
Godfrey M 99464fcd86 fixes general webhook not firing 2024-12-02 10:19:24 -08:00
snipe 93d4d24194 Fixed funky layout in importer
Some checks failed
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
Update Docker Hub Description / dockerHubDescription (push) Has been cancelled
Details 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 17:56:15 +00:00
snipe 1bbe9bf6c9 Merge remote-tracking branch 'origin/develop' 2024-12-02 17:43:03 +00:00
snipe 6874f703bf Some CSS twiddling 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 17:42:26 +00:00
snipe a7d5b3944e
Merge pull request #15908 from snipe/revert-15892-bug/harden-checkout-validation 
Revert "Hardened asset checkout validation by requiring integer"
 2024-12-02 17:42:02 +00:00
Marcus Moore b5e83899c6
Revert "Hardened asset checkout validation by requiring integer" 2024-12-02 09:37:21 -08:00
snipe dcd586e3cd Merge remote-tracking branch 'origin/develop' 2024-12-02 17:17:20 +00:00
snipe 1246ab1de7 Fixed bulk user form in user detail view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 17:14:36 +00:00
snipe 5a4a3aa8f3 Merge remote-tracking branch 'origin/develop' 2024-12-02 15:59:25 +00:00
snipe 2220828b00
Merge pull request #15904 from snipe/fixes/#15901 
Fixed #15901 - re-added required indicator on text and select custom fields
 2024-12-02 15:51:32 +00:00
snipe 716c67d4b8 Fixed #15901 - re-added required indicator on text and select custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-12-02 15:45:07 +00:00
snipe ee4a54be24 Fixed order by notes for users
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 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-27 15:48:13 +00:00
snipe 46be1ada60
Merge pull request #15892 from marcusmoore/bug/harden-checkout-validation 
Hardened asset checkout validation by requiring integer
 2024-11-27 14:55:11 +00:00
snipe e1c0a80c20 Merge remote-tracking branch 'origin/develop'
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-11-27 13:52:03 +00:00
snipe 2cb1b6d462 Use transformer on API update 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-27 13:51:53 +00:00
snipe 37ac7fe25c 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 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2024-11-26 20:38:46 +00:00
snipe 11f83b4cd9 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
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-11-26 20:12:14 +00:00
snipe 0f1d10bd69 Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-26 20:12:09 +00:00
snipe 82108f8a18
Merge pull request #15208 from akemidx/feature/sc-26415 
FEATURE: Option for Notes to be Required on Asset Checkin/Checkout
 2024-11-26 20:11:04 +00:00
akemidx a7dae10a82 fixing line 2024-11-26 15:06:25 -05:00
akemidx 2727210c78 requested changes from pr 2024-11-26 15:04:54 -05:00
Marcus Moore fcbd5dcae5
Harden asset checkout validation by requiring ints 2024-11-26 11:33:17 -08:00
snipe fa80716320
Merge pull request #15890 from Godmartinz/mobile-view-fix 
Mobile view fix
 2024-11-26 19:13:39 +00:00
Godfrey M 15c9df0ab1 fix mobile view for asset and user 2024-11-26 10:59:31 -08:00
snipe 6ee0c93c87 Merge remote-tracking branch 'origin/develop' 2024-11-26 18:47:22 +00:00
snipe 37e091adbb
Merge pull request #15889 from Godmartinz/Fix-user-API-location-update 
Fixed Users API `update` from clearing `location_id` unnecessarily
 2024-11-26 18:45:20 +00:00
Godfrey M 021e82927e fixed mobile view of assets 2024-11-26 10:42:59 -08:00