Godfrey M
2362cb5e52
refactor to getNotifiables
2024-11-04 16:32:46 -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
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
...
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
...
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
...
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
...
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
...
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
86d784bd59
Fixed #15740 - use non-translated strings for icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-28 13:37:59 +00:00
snipe
589f9cccdf
Fixed #15732
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-28 12:04:10 +00:00
snipe
4d848e45e6
Fixed #15736
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-28 11:55:24 +00:00
Godfrey M
58ff641f82
removed unused variables
2024-10-24 22:53:53 -07:00
Godfrey M
ce68f550d8
remove alert emails from cc
2024-10-24 16:01:17 -07:00
Godfrey M
6f0c1b12b1
this adds check out message for consumables
2024-10-24 15:04:54 -07:00
Godfrey M
278bc5e52a
ads check in and checkout message for license seats
2024-10-24 14:59:10 -07:00
Godfrey M
cce75a8185
adds check in and checkout messag for accessories
2024-10-24 14:48:23 -07:00
Godfrey M
e27ff13377
adds check in and checkout message for assets
2024-10-24 14:39:40 -07:00
Godfrey M
56365495a1
remove unnecessary fields in accessory checkout mail
2024-10-24 14:26:42 -07:00
Godfrey M
18da80e6de
fix checkoutable listener for microsoft teams
2024-10-24 14:24:00 -07:00
Godfrey M
18760e3fa1
replaces teams notification package, passes integration test
2024-10-24 12:21:51 -07:00
Godfrey M
57107c487c
fixed last test, definetly the last test
2024-10-24 09:40:10 -07:00
snipe
dfc63641dc
Merge pull request #15550 from uberbrady/fix_multi_create_partial_failure
...
Fix multi create partial failure (fixes: [RB-18591])
2024-10-24 11:40:50 +01:00
snipe
07a51ec8b1
Merge pull request #15712 from Godmartinz/fix_import-progress-bar
...
Upgraded `livewire v3.5.9 => v3.5.12`
2024-10-24 10:03:10 +01:00
Godfrey M
6329f5b87e
removed unused variable from test
2024-10-23 17:33:23 -07:00
snipe
e0ec6795b5
Use crucial for seeded data
...
Signed-off-by: snipe <snipe@snipe.net>
2024-10-24 01:27:50 +01:00
Godfrey M
15073a0d38
last test to fix
2024-10-23 17:27:37 -07:00
Godfrey M
a80c09c16d
Merge branch 'develop' into seperating_notification_n_mail
2024-10-23 17:23:55 -07: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
