Marcus Moore
6e31d0f2c3
Use appropriate category for licenses when seeding
2024-12-11 15:39:41 -08:00
snipe
b9a660683c
Merge pull request #15955 from ubc-cpsc/bugfix/GHSA-c2pc-g5qf-rfrf
2024-12-11 20:42:13 +00:00
Joël Pittet
014350a26b
Fix league/commonmark's quadratic complexity bugs may lead to a denial of service
2024-12-11 12:04:45 -08:00
snipe
06a0ac895d
Fixed #15928 - updated method name to setCreatedBy from SetUserId
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-11 18:34:18 +00:00
snipe
34a47e9e44
Add @sgross-emlix as a contributor
2024-12-11 18:09:53 +00:00
snipe
f5a9e4bafa
Fixes #15952 - fixed typo in content-type
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-11 18:09:19 +00:00
snipe
66339481cf
Merge pull request #15954 from Godmartinz/null_fix-for-reminder-command
2024-12-11 17:38:59 +00:00
Godfrey M
2e97b56deb
add null safe operator to acceptance reminder
2024-12-11 09:27:27 -08:00
akemidx
8adb62fd3a
width fix
2024-12-10 19:17:01 -05:00
akemidx
43537d414b
removed redundancy.
2024-12-10 16:42:55 -05:00
snipe
5014a95d9a
Updated supported versions
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-10 13:27:59 +00:00
akemidx
f2fab57187
cancel button pull to left.
...
added pull right to save
2024-12-09 19:28:57 -05:00
Marcus Moore
10a7ae8d47
Show frontend "required" validation for model and status selects
2024-12-09 16:09:51 -08:00
snipe
5f0efd8cdb
Merge pull request #15940 from snipe/reove_gh_templates
2024-12-09 19:35:31 +00:00
spencerrlongg
03c90d7b60
note, will come back to this once question is answered
2024-12-09 13:29:06 -06:00
snipe
31155b5351
Removed issue/PR templates
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-09 19:28:51 +00:00
snipe
cc8f72c3f9
Merge pull request #15914 from Godmartinz/send_reminder_emails
2024-12-09 19:23:13 +00:00
snipe
a0bab70def
Merge pull request #15939 from uberbrady/fix_ldap_asset_location_updater
2024-12-09 17:56:23 +00:00
Brady Wetherington
b5c8251539
Only update asset locations to assets checked out to users.
2024-12-09 17:40:10 +00:00
snipe
0149ed75fd
Merge pull request #15565 from spencerrlongg/bug/sc-25921
2024-12-09 17:00:10 +00:00
snipe
f72635955d
Merge pull request #15925 from Godmartinz/refactor-unaccepted-assets-reminder-notif
2024-12-09 16:40:21 +00:00
Godfrey M
5120cddda4
delete notification version of reminder
2024-12-05 16:02:55 -08:00
Godfrey M
97398f1e68
adds testing to unaccepted reminder command
2024-12-05 12:41:33 -08:00
Godfrey M
281ff6ad5d
wrap comment
2024-12-05 11:52:34 -08:00
Godfrey M
9d49b01958
cleans up the Unaccepted Asset reminder variables
2024-12-05 11:46:56 -08:00
Godfrey M
3f8916ea2e
fix duplicate emails being sent in unaccepted reminder command
2024-12-05 11:37:03 -08:00
Godfrey M
f6b9ae6aee
missed a spot
2024-12-05 10:18:35 -08:00
Godfrey M
de41def2b3
fixed conditionals
2024-12-05 10:15:57 -08:00
Godfrey M
52b051e940
add mail class for unaccepted assets reminders
2024-12-05 10:08:39 -08:00
snipe
a137e31797
Merge pull request #15920 from akemidx/asset-category-in-emails
2024-12-04 21:46:43 +00:00
spencerrlongg
513c78a09f
Refactor CheckoutRequest actions for consistency
...
Renamed CheckoutRequest action classes to include "Action" in their names for consistency and clarity. Enhanced error handling in controllers to standardize error responses with translations. Updated usage of the renamed action classes throughout the code to ensure proper integration.
2024-12-03 17:51:12 -06:00
spencerrlongg
0103f20193
Merge branch 'develop' into feature/sc-24347
2024-12-03 16:05:39 -06:00
akemidx
ca0f8ace99
fixed
2024-12-03 16:57:28 -05:00
akemidx
6252f0ac5e
layout / added category id
2024-12-03 16:10:42 -05:00
Godfrey M
b85b4b1e1b
remove table-responsive div from several index bladees
2024-12-03 10:26:14 -08:00
snipe
43d66a8fcc
Merge pull request #15918 from Godmartinz/mail_name_fix
...
Adds `MAIL_FROM_NAME` to mail envelope
2024-12-03 17:17:26 +00:00
Godfrey M
e5284c03e2
fix typo
2024-12-03 09:10:50 -08:00
Godfrey M
16283b8fc0
adds mail from name to mail envelope
2024-12-03 09:08:39 -08:00
Godfrey M
983b78edd9
add property check
2024-12-02 14:27:04 -08:00
snipe
2ad1407d51
Merge pull request #15909 from Godmartinz/checkin-out-notifications
...
Fixed general webhook option notifications not firing
2024-12-02 22:03:32 +00:00
Godfrey M
ab67c48352
fix unaccepted assets report resend acceptance
2024-12-02 13:03:09 -08:00
Marcus Moore
1d0d14876c
Harden asset checkout validation
2024-12-02 12:49:02 -08:00
Fiala06
bdb0e6c2a3
Update LdapSync.php
...
Fix for duplicate entries preventing the sync from continuing.
SQLSTATE[23000]: Integrity constraint violation: 1062 Duplicate entry '13178-6' for key 'PRIMARY' (Connection: mysql, SQL: insert into users_groups (group_id, user_id) values (6, 13178))
2024-12-02 11:07:37 -08:00
snipe
14730184c9
Fixed sr-only blank text
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-02 18:48:02 +00:00
snipe
8ff099e802
Merge pull request #15910 from marcusmoore/chore/include-testing-variable
...
Included MAIL_FROM_ADDR in phpunit configuration
2024-12-02 18:34:08 +00:00
Marcus Moore
ea1f8328b9
Include MAIL_FROM_ADDR in phpunit configuration
2024-12-02 10:23:02 -08:00
Godfrey M
99464fcd86
fixes general webhook not firing
2024-12-02 10:19:24 -08:00
snipe
93d4d24194
Fixed funky layout in importer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-02 17:56:15 +00:00
snipe
1bbe9bf6c9
Merge remote-tracking branch 'origin/develop'
2024-12-02 17:43:03 +00:00
snipe
6874f703bf
Some CSS twiddling
...
Signed-off-by: snipe <snipe@snipe.net>
2024-12-02 17:42:26 +00:00
