2810 commits

Author	SHA1	Message	Date
snipe	03b5c2e246	Fixed bad translation string ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-28 15:21:28 +01:00
Brady Wetherington	8df9007a8e	Merge branch 'snipeit_v7_laravel10' into develop	2024-05-27 18:08:27 +01:00
snipe	485caf1d92	Merge pull request #14755 from marcusmoore/chore/sc-25103/add-tests-around-asset-checkout ... Added tests around asset checkout	2024-05-25 11:33:33 +01:00
snipe	8b3ff5a82d	Handle potentially deleted admin users in license export ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-23 08:39:15 +01:00
Marcus Moore	8d74a976a1	Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout	2024-05-22 16:09:27 -07:00
Marcus Moore	6d104251b3	Remove todo	2024-05-22 15:40:54 -07:00
Marcus Moore	f16c79bb9a	Improve event assertions	2024-05-22 15:38:23 -07:00
Marcus Moore	c7fa2c04ad	Add scenario	2024-05-22 13:33:12 -07:00
Marcus Moore	8ca882d1c8	Complete a scenario	2024-05-22 13:23:49 -07:00
Brady Wetherington	4adbd7af4c	Merge branch 'develop' into snipeit_v7_laravel10	2024-05-22 21:02:11 +01:00
snipe	4bb7c1701f	Fiddled with storage facade a little more ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-22 17:44:49 +01:00
snipe	5fd0f56258	Use proper storage facade for checking if the file exists ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-22 17:38:49 +01:00
snipe	37d7e89e93	Fixed error message ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-22 17:29:43 +01:00
snipe	3ab197075a	Nicer handling of erroring when filename+log do not match ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-22 17:20:03 +01:00
snipe	bb96a190fd	Moved validator ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-22 12:34:48 +01:00
snipe	34f1ea1c0e	Re-order gating and refactor group syncing ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-21 10:00:49 +01:00
Brady Wetherington	f633dbba64	Merge branch 'develop' into snipeit_v7_laravel10	2024-05-20 12:55:29 +01:00
snipe	771c85e347	Translated account save message ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-20 11:19:31 +01:00
snipe	54b24434e1	Set file name variable ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 19:56:58 +01:00
snipe	81efaa7481	Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form	2024-05-16 16:13:21 +01:00
snipe	09914f508f	Removed more debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-16 15:16:52 +01:00
snipe	de088d452f	Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance ... Adds a note text area to asset acceptances/declines	2024-05-16 15:06:05 +01:00
snipe	55281313d8	Merge pull request #14474 from Godmartinz/asset-location-update-bug ... Fixed user assets not updating when a user changes location	2024-05-15 19:20:14 +01:00
snipe	c137fafa97	Updated language ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 18:10:43 +01:00
snipe	cb22a3d556	Updated comments again :-/ ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 17:52:50 +01:00
snipe	c7accb4599	Added comments ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 17:38:42 +01:00
snipe	c1d5b8713b	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:48 +01:00
snipe	8310b91e00	Use UploadFileRequest for audit files ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:48 +01:00
snipe	e5653eaa93	Save new data ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:47 +01:00
snipe	3c4098038d	Fail early if no tag ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-15 16:33:47 +01:00
snipe	eb09a99eb0	Merge pull request #14707 from spencerrlongg/bug/sc-24912 ... Bulk Edit Tests and Tweaks	2024-05-15 11:22:31 +01:00
Godfrey Martinez	5272824d85	Merge branch 'develop' into asset-location-update-bug	2024-05-13 10:47:25 -07:00
snipe	9bce0f2ff7	Format fix ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-13 18:19:14 +01:00
spencerrlongg	ad2ba252ee	two new test	2024-05-07 15:11:33 -05:00
spencerrlongg	17ef20ea92	alright, in a working place	2024-05-07 14:08:47 -05:00
snipe	8c327e6523	Handle user not found properly ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-07 19:16:56 +01:00
snipe	d942b8f1fb	Fixed alias names ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-07 17:40:35 +01:00
snipe	49dc9767b6	Added debugging :( ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-07 15:54:43 +01:00
snipe	410b547f3c	Added users and locatipon count to API ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-07 12:07:28 +01:00
Brady Wetherington	5b02a43957	Merge branch 'develop' into snipeit_v7_laravel10	2024-05-06 18:44:03 +01:00
snipe	4224bc0c43	Removed extra settings param ... Signed-off-by: snipe <snipe@snipe.net>	2024-05-02 12:36:57 +01:00
spencerrlongg	e177993bcc	notes and some playing around, push for eod	2024-05-01 16:57:11 -05:00
spencerrlongg	25480293dc	change keys to values, add test	2024-04-30 18:03:26 -05:00
snipe	103809b65f	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 21:01:43 +01:00
snipe	3f04afee5c	Removed unused method ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 19:01:26 +01:00
snipe	6dc9ccffcd	Refactor api for handling audit/expected checkins ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 18:56:57 +01:00
snipe	bf058bd5c6	Use updated scopes ... Signed-off-by: snipe <snipe@snipe.net>	2024-04-26 14:02:56 +01:00
Brady Wetherington	3f5c5cbe82	Merge branch 'develop' into snipeit_v7_laravel10	2024-04-24 16:24:43 +01:00
snipe	2439758ef3	Merge pull request #14587 from Godmartinz/License-export-button ... Added a License Export function and button	2024-04-24 04:42:56 +01:00
snipe	685f1cbfb8	Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels ... Removed encrypted fields from label options	2024-04-23 13:31:38 +01:00