Commit graph

15782 commits

Author SHA1 Message Date
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
Godfrey M
ab3b9c4510 remove unnecessary code from checkinasset notification 2024-10-23 16:24:01 -07:00
Godfrey M
2cc2b2b1df apply array_filter to cc emails to prevent errors 2024-10-23 16:06:27 -07:00
Godfrey M
62d06b44d6 set fallback from email address to service.snipe-it.io 2024-10-23 15:43:42 -07:00
Godfrey M
f29a383179 Merge branch 'develop' into seperating_notification_n_mail
# Conflicts:
#	app/Notifications/CheckoutConsumableNotification.php
2024-10-23 15:15:14 -07:00
Godfrey M
fd74c35102 remove old notify by mail from consumable notification 2024-10-23 15:08:29 -07:00
Godfrey M
c681946b1d added component markdown changes 2024-10-23 15:05:39 -07:00
Godfrey M
257d25bd9e removed import notification from test, feature is not present in project 2024-10-23 14:56:54 -07:00
Godfrey M
6c34a5c52c conditionally check cc emails, initiate variables 2024-10-23 14:54:21 -07:00
Godfrey M
1b5f4415ae corrected cc email behavior 2024-10-23 14:44:45 -07:00
snipe
55ba6279a4 Use trans_choice on alert menu
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
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
d58f87862c
Merge pull request #15719 from snipe/#15717_adds_qty_to_consumable
Fixed #15717 - Added ability to checkout consumables in variable qty via API
2024-10-23 15:09:50 +01:00