16158 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
snipe	0f18ee86f7	Updated translations ... Signed-off-by: snipe <snipe@snipe.net>	2024-11-25 13:05:05 +00:00
snipe	4a5f65616f	Merge remote-tracking branch 'origin/develop'	2024-11-25 12:56:08 +00:00
spencerrlongg	5aa2f307cd	Remove debug dump statements ... This commit removes various debug dump statements from BulkAssetsController and UpdateAssetAction. These changes clean up the code and improve readability by eliminating unnecessary debugging output. Maintaining clean code ensures better maintainability and performance.	2024-11-22 20:49:52 -06:00
snipe	f125c90c94	Merge pull request #15870 from marcusmoore/bug/sc-26857 ... Always call resizeCanvas	2024-11-22 00:59:36 +00:00
akemidx	0d608552ef	orange bar for requirednessness	2024-11-21 19:09:54 -05:00
akemidx	dd223fc215	commit for testing	2024-11-21 19:01:27 -05:00
Marcus Moore	87756cac66	Remove debugging	2024-11-21 14:30:17 -08:00
Marcus Moore	9f49c25401	WIP: move signature pad creation up and add debugging	2024-11-21 13:12:13 -08:00
Marcus Moore	d0378070c8	Always call resizeCanvas	2024-11-21 12:38:53 -08:00
snipe	9f395d1f6a	Merge remote-tracking branch 'origin/develop'	2024-11-21 19:58:49 +00:00
snipe	feba860a90	Merge pull request #15850 from akemidx/bug/sc-27448 ... Adding colon to password translation string	2024-11-21 19:58:04 +00:00
akemidx	424316df9f	fixing colon placements	2024-11-21 14:32:22 -05:00
snipe	b7aedb7dcb	Merge pull request #15818 from spencerrlongg/bug/sc-27213 ... Resolves Validation for Encrypted Numeric and Alpha Custom Fields	2024-11-21 19:25:27 +00:00
snipe	8b38dc83f6	Merge pull request #15851 from marcusmoore/testing/api-component-checkin ... Fixed bug in component checkins via api	2024-11-21 19:24:12 +00:00
snipe	ad2b85393b	Merge remote-tracking branch 'origin/develop' ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/mix-manifest.json	2024-11-21 19:23:10 +00:00
snipe	85c1b0ec57	[Snyk] Upgrade jquery-ui from 1.14.0 to 1.14.1 #15868 ... Signed-off-by: snipe <snipe@snipe.net>	2024-11-21 19:22:08 +00:00
spencerrlongg	a4fefc2b5a	get rid of comment	2024-11-21 11:30:27 -06:00
spencerrlongg	a3cdb3b62f	Fix error message format in BulkAssetsController ... Previously, the error message was set as a string, which led to an inconsistency in how errors were handled. This change updates the error message to be an array, ensuring it aligns with the expected format.	2024-11-21 11:11:11 -06:00
snipe	b99b56b32b	Merge remote-tracking branch 'origin/develop'	2024-11-21 14:41:42 +00:00
snipe	2a21cce4f5	Merge pull request #15839 from Godmartinz/fix-mail-envelope-variable ... replace env with config variable for from address	2024-11-21 14:41:04 +00:00
snipe	3a683d84a7	Merge pull request #15859 from Godmartinz/remove_name_null_warning ... Adds a ternary for blank emails for mail notifications	2024-11-21 14:38:03 +00:00
snipe	e05f443886	Merge pull request #15864 from marcusmoore/testing/api-component-checkout ... Added tests for component checkout api endpoint	2024-11-21 14:37:45 +00:00
Marcus Moore	d65254c4ec	Add tests for component checkout api endpoint	2024-11-20 15:34:08 -08:00
spencerrlongg	10126b8362	Fix error handling in BulkAssetsController ... Updated exception handling to capture detailed validation errors in BulkAssetsController. Corrected formatting in notifications view for displaying error messages.	2024-11-20 16:42:56 -06:00
Godfrey M	6969b8be47	remove the changes to mail.from.address default	2024-11-20 14:25:57 -08:00
snipe	0a3bca078c	Merge pull request #15860 from marcusmoore/tests/switch-to-file-for-sqlite-in-action ... Improved speed of sqlite tests in GitHub Actions	2024-11-20 22:09:11 +00:00
Marcus Moore	9bbd802fce	Use database file for sqlite in GitHub Action for tests	2024-11-20 12:33:58 -08:00
Marcus Moore	f932a4fc76	Always run validation on checkin	2024-11-20 12:25:06 -08:00
spencerrlongg	6ddaa0bb3e	Handle exceptions when saving assets in AssetImporter ... Added try-catch blocks to manage ValidationException and generic exceptions during asset saving. This ensures proper logging of errors and reporting of unexpected issues, improving robustness and error handling in the asset import process.	2024-11-20 13:25:06 -06:00
spencerrlongg	617fe85699	Fix typos and use correct array notation in asset updates ... Corrected spelling mistakes in test files and updated code to use the correct array notation in request validation for asset updates. This ensures better readability and consistency in the codebase while preventing potential errors related to incorrect data handling.	2024-11-20 13:11:03 -06:00
Godfrey M	f7c1fc852d	no checked out to email doesnt trigger a 500	2024-11-20 08:29:28 -08:00
spencerrlongg	03d9f936ab	Update asset model association and location logic handling ... Refactor the asset update process to properly associate models and handle location ID changes based on request input. Introduce checks for model_id, company_id, and last_audit_date to ensure correct updates. Add commentary to clarify the handling of location ID logic and temporarily resolve issues with location assignment when requests do not expect JSON responses.	2024-11-20 10:17:35 -06:00
spencerrlongg	1704a07663	Allow null values for asset dates in update action ... This commit improves the asset update functionality by allowing null values for purchase date, next audit date, and expected check-in date when specified in the request. Additionally, minor corrections were made in the test code to enhance readability and correctness.	2024-11-20 09:58:13 -06:00
snipe	5522def054	Merge pull request #15854 from NebelKreis/feature/add-category-to-asset-mails ... Added #15803: Category Field to Asset Related Mails	2024-11-20 13:51:34 +00:00
snipe	8cd4b3303e	Merge pull request #15847 from NebelKreis/feature/hardware-label-generation-api ... Added #15677: API Route for Generating Asset Labels	2024-11-20 11:14:28 +00:00
NebelKreis	d5c141dc59	Fix: Removed setting validation as it is not strictly necessary	2024-11-20 11:55:48 +01:00
NebelKreis	7618169d79	Feature: Added category to asset requested email	2024-11-20 11:22:19 +01:00
NebelKreis	eb026248a8	Feature: Added category to asset acceptance/decline email	2024-11-20 10:59:59 +01:00
NebelKreis	4304af0508	Feature: Added category to asset checkin email	2024-11-20 10:27:37 +01:00
NebelKreis	61eff02fcb	Feature: Added category to asset checkout email	2024-11-20 10:27:22 +01:00
spencerrlongg	94e7310cd9	Fix bulk asset update error handling and improve access checks ... Improved the error handling in the BulkAssetsController by re-enabling custom field permission checks. Updated the UpdateAssetAction to better handle encrypted custom fields and streamlined user roles in the BulkEditAssetsTest.	2024-11-19 19:57:26 -06:00
snipe	cca76005a2	Merge pull request #15852 from marcusmoore/testing/ui-delete-component ... Added tests around deleting component via ui	2024-11-20 01:27:19 +00:00
Marcus Moore	54f5f46e31	Improve check for image existence	2024-11-19 16:44:42 -08:00
Marcus Moore	51a0767be9	Add tests around deleting component via ui	2024-11-19 16:44:19 -08:00
Marcus Moore	da4c877ed8	Use === over ==	2024-11-19 16:13:53 -08:00
Marcus Moore	e8cad0df69	Formatting	2024-11-19 16:13:30 -08:00
Marcus Moore	59fe53842d	Add tests around component check ins via api	2024-11-19 16:11:23 -08:00
spencerrlongg	0353c7a03b	Fix error handling in BulkAssetsController ... Updated error handling to ensure all exceptions are properly stored in the errors array and removed unused custom_field_problem variable. Also, uncommented location assignment code in UpdateAssetAction for clearer logic.	2024-11-19 17:56:56 -06:00
spencerrlongg	3cf583ab03	Add CustomFieldPermissionException handling	2024-11-19 17:45:35 -06:00
akemidx	1e513312eb	adding colon to password translation	2024-11-19 16:58:10 -05:00