NebelKreis
f96b7c5056
Feature: Added data type context for select options with "URL:" and "Data:" labels, including translations
2024-11-05 13:40:33 +01:00
akemidx
82c38a8b18
or statement for if/else
2024-11-04 20:43:18 -05:00
akemidx
2f5e468b3c
this fixes the assigned to piece
2024-11-04 19:48:34 -05: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
Marcus Moore
4daa8e7c63
Indenting
2024-11-04 12:49:44 -08:00
Marcus Moore
41f25341fd
Populate select with selected template
2024-11-04 12:32:05 -08:00
snipe
287f4addf0
Merge pull request #15771 from snipe/revert-15744-chore/action-tests-debugging
...
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
...
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
Godfrey M
de77eda33d
another line indent
2024-10-31 14:38:32 -07:00
Godfrey M
ee58fcc898
moved lines in for labels
2024-10-31 14:37:08 -07:00
Godfrey M
ae3cb7b37b
adds migration to update new with old if blank and remove old barcod variables
2024-10-31 14:35:13 -07:00
snipe
95dba6c426
Merge remote-tracking branch 'origin/develop'
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
Marcus Moore
5f83cb6a14
Use route model binding
2024-10-31 12:34:06 -07:00
Marcus Moore
ae24b73b32
Fix action_type from "created" to" create"
2024-10-31 12:19:41 -07:00
Marcus Moore
4aedbb52fa
Implement activity logging transformer tests
2024-10-31 12:15:05 -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
Marcus Moore
20dab4d89d
Simplify tests
2024-10-30 16:50:55 -07:00
Marcus Moore
e871481042
Add group
2024-10-30 16:48:42 -07:00
akemidx
f10807661d
fixing bulk delete table
2024-10-30 19:26:52 -04:00
Marcus Moore
d727b03d95
Implement activity log test
2024-10-30 14:25:07 -07:00
Marcus Moore
0cc3031864
Implement deleted log
2024-10-30 14:05:27 -07:00
Marcus Moore
59e6874a4a
Scaffold test cases
2024-10-30 13:07:51 -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
Marcus Moore
930ef3fd11
Work on tests for activity logging
2024-10-30 12:22:59 -07: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'
2024-10-30 13:21:25 +00: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
Marcus Moore
35f8a71c71
Test organization
2024-10-29 16:17:12 -07:00
Marcus Moore
86762c5e90
Remove marker test case
2024-10-29 16:12:34 -07:00
Marcus Moore
3c75fc2ced
Move test
2024-10-29 16:12:13 -07:00
Marcus Moore
702edf7908
Remove x from select dropdown
2024-10-29 15:34:00 -07:00
Marcus Moore
54b4db86d2
Revert "Add soft deletes"
...
This reverts commit 0eadab49f1
2024-10-29 15:33:49 -07:00
Marcus Moore
0eadab49f1
Add soft deletes
2024-10-29 15:26:18 -07:00
