Commit graph

17264 commits

Author SHA1 Message Date
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
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
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
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
Godfrey M
0d59ccd6a6 upgraded livewire v3.5.9 => v3.5.12 2024-10-22 14:23:26 -07:00
Marcus Moore
dd97e4ea82
Update permission tests 2024-10-22 14:22:19 -07:00
snipe
1979ada656 Merge remote-tracking branch 'origin/develop' 2024-10-22 22:10:53 +01:00
snipe
5da3ce3564
Merge pull request #15711 from marcusmoore/fixes/custom-fieldset-checkboxes
Fixed custom field checkboxes on asset edit page
2024-10-22 22:10:20 +01:00
snipe
c536dbc741 Merge remote-tracking branch 'origin/develop' 2024-10-22 22:08:59 +01:00
snipe
c3bbca30ad
Merge pull request #15710 from snipe/fixes_lightbox_for_avif
Fixes #15701 - load avif files properly in lightbox
2024-10-22 22:07:50 +01:00
snipe
37f14fff3b Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
2024-10-22 22:07:28 +01:00
snipe
eb6c51fabd Fixes #15701 - load avif files properly in lightbox
Signed-off-by: snipe <snipe@snipe.net>
2024-10-22 22:04:57 +01:00
Marcus Moore
5ecd2b6293
Default checkbox elements to an empty array 2024-10-22 14:04:05 -07:00
Godfrey M
1e31592c55 messing with the tests 2024-10-22 11:49:06 -07:00
snipe
dccb788a88
Merge pull request #15691 from marcusmoore/fixes/get-id-for-current-user
Updated `Company::getIdForCurrentUser()` to return null in certain scenarios
2024-10-22 17:44:30 +01:00
Marcus Moore
d10fe77ee7
Merge branch 'develop' into fixes/get-id-for-current-user 2024-10-22 09:38:31 -07:00
snipe
7774dd0b7d Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
2024-10-22 16:53:47 +01:00
snipe
5e1d792bba
Merge pull request #15687 from NebelKreis/fix/dashboard-title-casing
Fixed #15686: Corrected capitalization for dashboard section titles by removing strtolower()
2024-10-22 16:52:28 +01:00
snipe
9cf71976f6 Fixed #15706 - Removed purchase order number from asset import
Signed-off-by: snipe <snipe@snipe.net>
2024-10-22 16:51:42 +01:00
snipe
15745d9737
Merge pull request #15566 from Godmartinz/status-label-error-message
Fixed Status Labels Error Message
2024-10-22 16:39:44 +01:00
snipe
bd97955b9e Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
2024-10-22 16:38:46 +01:00
snipe
252d99421c
Merge pull request #15689 from snipe/better_handle_inline_files
Better handle inline files in file listing
2024-10-22 16:26:48 +01:00