Commit graph

17439 commits

Author SHA1 Message Date
Marcus Moore
7238238d1f
Use created_by instead of user_id 2024-10-23 16:40:03 -07: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
Marcus Moore
84f6638f50
Add authorization check 2024-10-23 16:11:10 -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
Marcus Moore
e390a95bd3
Improve back button behavior 2024-10-23 15:42:09 -07:00
Marcus Moore
3616c92148
Reflash template name 2024-10-23 15:40:54 -07:00
Marcus Moore
2fcc7e1188
Make template name required 2024-10-23 15:24:58 -07:00
Marcus Moore
8a06f4ad82
Improve label 2024-10-23 15:21:02 -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
Marcus Moore
853e14f369
Fix width 2024-10-23 13:24:06 -07:00
Marcus Moore
c1aa33862d
Add error message for eol start and end fields 2024-10-23 13:22:21 -07:00
Marcus Moore
30dc5fa0cf
Allow retrieving eol start and end dates 2024-10-23 13:21:44 -07:00
Marcus Moore
94e168fa15
Fix label 2024-10-23 13:17:20 -07:00
snipe
7bbe23995d Merge remote-tracking branch 'origin/develop' 2024-10-23 19:14:36 +01: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
spencerrlongg
c76cccbb68 rm extraneous methods in exception 2024-10-23 12:56:36 -05:00
snipe
574f2e096d Merge remote-tracking branch 'origin/develop' 2024-10-23 17:57:37 +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
e15e33b648 Merge remote-tracking branch 'origin/develop' 2024-10-23 15:14:29 +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
snipe
0b6859c491 Added ability to checkout consumables in variable qty
Signed-off-by: snipe <snipe@snipe.net>
2024-10-23 15:05:35 +01:00
spencerrlongg
fdb6970f36 this is pretty much done 2024-10-23 01:41:27 -05:00
spencerrlongg
b0d7eb2168 cancel action finished 2024-10-22 22:44:28 -05:00
spencerrlongg
79e6eafafa cancelled scaffolded out 2024-10-22 22:33:29 -05:00
spencerrlongg
3ee008e871 revert 2024-10-22 20:54:20 -05:00
spencerrlongg
48c812d345 bunch of cleanup, split cancel out 2024-10-22 20:48:27 -05:00
Marcus Moore
4217d7402b
Improve tests 2024-10-22 17:50:40 -07:00
Marcus Moore
3d28a9090c
Improve test 2024-10-22 17:38:22 -07:00
Marcus Moore
271de1eceb
Improve tests 2024-10-22 17:37:23 -07:00
Marcus Moore
b6aae1f8a9
Group routes 2024-10-22 17:30:34 -07:00
Marcus Moore
c313a78c3c
Remove outdated @since annotations 2024-10-22 17:04:23 -07:00
Marcus Moore
37d65dac3d
Add todo 2024-10-22 17:01:37 -07:00
Marcus Moore
5ebf013d4e
Add comment 2024-10-22 16:54:38 -07:00
Marcus Moore
02c22c9efb
Add test case 2024-10-22 16:52:59 -07:00
Godfrey M
1e9922a0b0 fix moar tests 2024-10-22 16:14:36 -07:00
Godfrey M
ead27accac fixed accessory tests and notifiable target 2024-10-22 15:45:52 -07:00
spencerrlongg
8a99cc1391 test working 2024-10-22 17:25:58 -05:00
Marcus Moore
d953519db6
Merge branch 'develop' into saving_custom_report_template 2024-10-22 15:11:18 -07:00
Godfrey M
727c0e458c remove translation 2024-10-22 14:34:39 -07:00
Godfrey M
870dc747db oops 2024-10-22 14:27:32 -07:00
Godfrey M
0fb3d83fac revert controller change 2024-10-22 14:26:54 -07:00