Commit Graph

163 Commits

Author SHA1 Message Date
snipe a67b320cae Merge pull request #15907 from uberbrady/protect_assigned_to_assigned_type_rebased
Rebased version of #15629 - prevent setting assigned_to without setting assigned_type
2025-05-05 20:42:46 +01:00
snipe 1c387795fe Merge pull request #16683 from marcusmoore/bug/sc-28755
Create default label when importing assets if none exists
2025-04-14 09:52:48 +01:00
Marcus Moore ea6a903d8a Implement tests including test failure 2025-04-10 13:29:05 -07:00
Marcus Moore 9086e5dba7 Scaffold some asset importer tests 2025-04-10 13:03:50 -07:00
akemidx 275e1beda2 updating for conflicts and adding test 2025-04-08 13:15:28 -04:00
akemidx f659b7631d Merge branch 'develop' into lastnameemail 2025-04-08 13:10:26 -04:00
akemidx 443a5c2348 chaning username dropdown to be usernames and not emails 2025-04-07 19:25:32 -04:00
akemidx f0bf77735d adding last name only as a email choice 2025-04-03 23:34:04 -04:00
Marcus Moore 7df636515f Move to data providers 2025-03-05 18:20:40 -08:00
Marcus Moore 3db124e709 First pass at updating wording for asset checkout mail 2025-03-05 18:12:23 -08:00
Marcus Moore cb5b0bd89c Stop reporting report template creates, updates, and deletes to action log 2025-03-04 15:11:37 -08:00
Marcus Moore e88bba51bb Merge branch 'develop' into acceptance-reminder-subject 2025-02-24 11:55:50 -08:00
Marcus Moore 43f679a554 Revert some changes from #15525 2025-02-20 12:59:16 -08:00
snipe 3d47a8ba50 Fixed name format tests (#16236)
Signed-off-by: snipe <snipe@snipe.net>
2025-02-18 14:52:52 +00:00
snipe 452185be45 Merge pull request #16199 from akemidx/feature/sc-28271
Adding <Last Name.First Initial> as an option for usernames
2025-02-18 14:42:54 +00:00
Brady Wetherington b7bd56daf7 Instead of saving TLS cache-files on save, cache them when used 2025-02-13 15:09:28 +00:00
akemidx 1e07927e78 test created and passing 2025-02-11 19:35:55 -05:00
Marcus Moore fdcb891cbb Improve test case 2025-01-29 15:20:56 -08:00
Marcus Moore da8999f59a Add failing test 2025-01-22 10:21:18 -08:00
snipe 1c8d94c953 Merge pull request #15525 from akemidx/updated_ad_hoc_notes 2025-01-14 11:33:21 +00:00
Brady Wetherington eccdcc373e parent 2220828b00
author Brady Wetherington <bwetherington@grokability.com> 1728320853 +0100
committer Brady Wetherington <bwetherington@grokability.com> 1733158021 +0000

Prevent setting assigned_to without setting assigned_type

Fixed tests to include assigned_type when setting assigned_to

Add new tests for assigned_to without assigned_type

Added tighter validation to assigned_to and assigned_type, new tests

Fixed wrong comment

Fixed tests to include assigned_type when setting assigned_to

Add new tests for assigned_to without assigned_type

Fixed wrong comment
2024-12-02 16:53:08 +00:00
Marcus Moore 53de97db4e Merge branch 'develop' into saving_custom_report_template 2024-11-12 10:36:07 -08:00
Marcus Moore 5574c5fa49 Improve comments 2024-11-12 10:35:22 -08:00
Marcus Moore 4bb19152c4 Move test 2024-11-07 17:01:47 -08: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
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
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
Marcus Moore 930ef3fd11 Work on tests for activity logging 2024-10-30 12:22:59 -07: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 b97c54a54b Improve handling of old data for text inputs 2024-10-29 11:25:54 -07:00
Marcus Moore 7777147af5 Add custom-reporting group 2024-10-28 14:42:44 -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 1e9922a0b0 fix moar tests 2024-10-22 16:14:36 -07:00
Marcus Moore d953519db6 Merge branch 'develop' into saving_custom_report_template 2024-10-22 15:11:18 -07:00
Marcus Moore d10fe77ee7 Merge branch 'develop' into fixes/get-id-for-current-user 2024-10-22 09:38:31 -07:00
Marcus Moore 3f79fd7ea7 Add test to ensure icon component does not end in newline 2024-10-21 17:07:40 -07:00
Marcus Moore a8d853c44a Remove focus group tags 2024-10-17 15:26:27 -07:00
Marcus Moore 979e4502ff Have getIdForCurrentUser method return null if FMCS enabled, user is not super admin, and does not have company 2024-10-17 15:14:39 -07:00
Godfrey M cdd4fef7df attempt to fix tests p2 2024-10-17 13:34:55 -07:00
Marcus Moore 5306e1cd15 Merge branch 'develop' into saving_custom_report_template
# Conflicts:
#	resources/views/partials/forms/edit/location-select.blade.php
#	resources/views/partials/forms/edit/manufacturer-select.blade.php
#	resources/views/partials/forms/edit/model-select.blade.php
#	resources/views/partials/forms/edit/supplier-select.blade.php
#	resources/views/reports/custom.blade.php
2024-10-15 12:32:01 -07:00
snipe 1f34657734 Fixed test
Signed-off-by: snipe <snipe@snipe.net>
2024-10-10 12:30:35 +01:00
Marcus Moore e974c96eda Update to created_by 2024-09-26 12:41:16 -07:00
Marcus Moore 2004e58b53 Merge branch 'develop' into updated_ad_hoc_notes 2024-09-26 12:29:28 -07:00
Marcus Moore 47763d1e1a Add tests for adding notes to assets 2024-09-26 12:13:36 -07:00