snipe
b6ad69fac2
Merge pull request #15793 from snipe/allow_eol_explicit
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Allow user to specify null for calculation or explicit on bulk edit
2024-11-10 18:05:20 +00:00
snipe
47b2cdb846
Allow user to specify null for calculation or explicit on bulk edit
...
Signed-off-by: snipe <snipe@snipe.net>
2024-11-10 18:04:13 +00:00
snipe
357ef7e375
Merge pull request #15792 from snipe/edit_eol_from_bulk
...
Added EOL date to bulk asset edit
2024-11-10 17:48:25 +00:00
snipe
6928b1b273
Added eol date to bulk asset edit
...
Signed-off-by: snipe <snipe@snipe.net>
2024-11-10 17:47:10 +00:00
snipe
000f3171e3
Upgrade jspdf-autotable from 3.8.3 to 3.8.4 #15786
...
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
Signed-off-by: snipe <snipe@snipe.net>
2024-11-08 10:28:01 +00:00
snipe
5ef3183a52
Merge pull request #15783 from uberbrady/improve_user_and_location_manager_indexes
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
Improved indexes on manager_id for locations and users, including del…
2024-11-07 11:44:06 +00:00
Brady Wetherington
050831868e
Improved indexes on manager_id for locations and users, including deleted_at
2024-11-07 11:39:27 +00:00
snipe
a41529dbc4
Merge pull request #15780 from uberbrady/add_manager_indexes
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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
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
...
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
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
...
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
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
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
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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
f68df1fa06
Made type searchable in action logs
...
Crowdin Action / upload-sources-to-crowdin (push) Waiting to run
Docker images (Alpine) / docker (push) Waiting to run
Docker images / docker (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Waiting to run
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Waiting to run
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Waiting to run
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
...
Crowdin Action / upload-sources-to-crowdin (push) Has been cancelled
Docker images (Alpine) / docker (push) Has been cancelled
Docker images / docker (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.1) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.2) (push) Has been cancelled
Tests in MySQL / PHP ${{ matrix.php-version }} (8.3) (push) Has been cancelled
Tests in SQLite / PHP ${{ matrix.php-version }} (8.1.1) (push) Has been cancelled
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
