DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15849 commits 101 branches 268 tags 288 MiB
Commit graph

15849 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe aa080945f6 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/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-11-06 21:26:21 +00:00
snipe a41529dbc4
Merge pull request #15780 from uberbrady/add_manager_indexes
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 new indexes to locations and users for faster manager lookups
 2024-11-06 21:22:45 +00:00
Brady Wetherington 4fcf5ac7da Add new indexes to locations and users for faster manager lookups 2024-11-06 21:19:41 +00:00
snipe aa168fcb5b Updated BS table to 1.23.5 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-06 18:41:52 +00:00
snipe 9c1c93ad52
Merge pull request #15774 from marcusmoore/feature/sc-27350 
Added Checkout ID column to user accessory table
 2024-11-06 18:40:35 +00:00
Marcus Moore ad99b8b456
Use generic ID translation 2024-11-06 10:37:31 -08:00
snipe b96a312539
Merge pull request #15779 from ubc-cpsc/bugfix/CVE-2024-50345 
Fixes CVE-2024-50342, CVE-2024-50345, CVE-2024-51736
 2024-11-06 18:29:22 +00:00
Joël Pittet bab1e58ea4 symfony/http-client CVE-2024-50342, symfony/http-foundation CVE-2024-50345, symfony/process CVE-2024-51736 2024-11-06 09:46:11 -08:00
snipe 9ce1e78c5c Merge remote-tracking branch 'origin/develop' 2024-11-06 14:16:09 +00:00
snipe 654f67b6ac Updated webpack 
Signed-off-by: snipe <snipe@snipe.net>
 2024-11-06 14:05:42 +00:00
snipe 3965bcd7c1
Merge pull request #15773 from Godmartinz/Fix_failing_failing_tests 
Fixed notifications for licenses and asset to asset checkoutables
 2024-11-06 14:02:44 +00:00
Godfrey M 2362cb5e52 refactor to getNotifiables 2024-11-04 16:32:46 -08:00
Marcus Moore e7cb4a75eb
Show accessory checkout id in user accessory table 2024-11-04 15:56:53 -08:00
Godfrey M 93494ac554 put dataprovider back in for tests 2024-11-04 15:17:58 -08:00
Godfrey M 0d707a1851 fixes notifications for licenses and asset to asset checkouables 2024-11-04 15:13:10 -08:00
snipe 287f4addf0
Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging
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 
Revert "Added the display of logs when tests fail in GitHub Actions"
 2024-11-04 20:06:24 +00:00
Marcus Moore 2e96d478f1
Revert "Added the display of logs when tests fail in GitHub Actions" 2024-11-04 11:04:17 -08:00
snipe f32ebdc7ac
Merge pull request #15765 from marcusmoore/chore/add-missing-livewire-file
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 
Added missing Livewire file
 2024-10-31 22:39:58 +00:00
Marcus Moore d6c7dc8e1c
Add missing livewire file 2024-10-31 15:37:01 -07:00
snipe 95dba6c426 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-10-31 21:06:59 +00:00
snipe 5897d37fcf
Merge pull request #15763 from Godmartinz/no_to_email_check 
Fixed emails not being send if target has no email or if not instance of User. Cc_emails will still be sent.
 2024-10-31 20:54:01 +00:00
Godfrey M 21a27dcac1 fixed conflicts 2024-10-31 12:55:46 -07:00
Godfrey M 3791380764 remove unused uses 2024-10-31 12:52:47 -07:00
Godfrey M 7a0f79ecd2 remove test route 2024-10-31 12:51:22 -07:00
Godfrey M 97a449e80e removes instanceof User check 2024-10-31 12:50:13 -07:00
Godfrey M e65942064e send emails even if target has no email 2024-10-31 12:45:29 -07:00
snipe 49de07045a
Merge pull request #15731 from Godmartinz/refacto_ms_teams_notifs
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 MS Team Notifications to utilize workflows after deprecation
 2024-10-31 17:53:17 +00:00
snipe 7e996c40f5
Merge pull request #15758 from snipe/jerm/fix-deprecation-warning
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 ${var} deprecation warning in License model
 2024-10-31 02:51:42 +00:00
Jeremy Price 69e74bbdd3 Fix ${var} deprecation warning in License model 
When upgrading to php8.3 i started getting deprecation warning about
using ${var} instead of {$var} in 2 places in License.php

PHP Deprecated:  Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 187
PHP Deprecated:  Using ${var} in strings is deprecated, use {$var} instead in /var/www/snipe-it/app/Models/License.php on line 219

This simple fix switches the offending statements to {$var} syntax.
 2024-10-30 19:43:54 -07:00
snipe 73e8f160cf
Merge pull request #15756 from Godmartinz/cc-email-array
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 
changes `admin_cc_email` validation to allow an array
 2024-10-30 19:29:09 +00:00
Godfrey M bd23772fe9 changes cc_email validation to allow array 2024-10-30 11:42:15 -07:00
Godfrey M 73772a0138 change button text 2024-10-30 11:12:31 -07:00
Godfrey M b26cae372c merged in develop 2024-10-30 10:40:23 -07:00
Godfrey M d6ba303f39 Merge branch 'develop' into refacto_ms_teams_notifs 
# Conflicts:
#	app/Listeners/CheckoutableListener.php
 2024-10-30 10:27:45 -07:00
snipe 931ab103c1 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-10-30 13:21:25 +00:00
snipe f68df1fa06 Made type searchable in action logs
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-30 13:21:13 +00:00
snipe f0813e03bf
Merge pull request #15681 from Godmartinz/seperating_notification_n_mail 
Separated Notifications and Emails: Check ins and Check outs
 2024-10-30 12:18:41 +00:00
snipe 05875ebd1f Updated translations
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-10-28 22:04:35 +00:00
Godfrey M 9a0eee8f03 revert testing variables 2024-10-28 15:03:43 -07:00
Godfrey M 6128765d1f change wording on notification button 2024-10-28 15:03:03 -07:00
Godfrey M c24f79c025 update method comment 2024-10-28 14:58:43 -07:00
Godfrey M e7c4343c90 readd checkin accessory format 2024-10-28 14:56:48 -07:00
Godfrey M c0620c27ff adds back laravels channel formats 2024-10-28 14:30:34 -07:00
Godfrey M ed81973fe6 adds notifications for deprecation 2024-10-28 13:57:42 -07:00
snipe 2d318b394c
Merge pull request #15744 from marcusmoore/chore/action-tests-debugging 
Added the display of logs when tests fail in GitHub Actions
 2024-10-28 18:41:49 +00:00
Godfrey M b987b3dc00 adds back the laravel channels package and applies a deprecated check 2024-10-28 10:57:48 -07:00
Marcus Moore 5c49716129
Dump logs on test failure 2024-10-28 10:24:35 -07:00
snipe 755604677c 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-10-28 13:38:19 +00:00
snipe 86d784bd59 Fixed #15740 - use non-translated strings for icons
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-28 13:37:59 +00:00
snipe 65f4f3def2 Merge remote-tracking branch 'origin/develop' 2024-10-28 12:04:20 +00:00