Commit graph

3920 commits

Author SHA1 Message Date
snipe
c4b7e77498
Merge pull request #14089 from spencerrlongg/bug/escaped_quotes_in_listbox
Use `htmlentities()` instead of `htmlspecialcharacters()` on Custom Field Listbox Values
2024-03-21 12:55:25 +00:00
snipe
91c7180bfd
Merge pull request #14469 from snipe/feature/sc-19515/2fa_reset_log
Added 2FA reset log entry
2024-03-21 12:52:22 +00:00
snipe
7c39f516b9
Merge pull request #14421 from marcusmoore/fixes/add-minimal-validation-around-asset-tags
Adds a minimal amount of validation around asset_tags in AssetsController
2024-03-21 00:04:44 +00:00
snipe
5ed2bd0fb7 Skip the normal edit observer
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 23:52:22 +00:00
snipe
2067b1138a Added the log item
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 23:43:58 +00:00
Marcus Moore
530291f81c
Implement some tests 2024-03-20 14:28:27 -07:00
spencerrlongg
e7b9903341 delete some extra lines 2024-03-20 15:29:06 -05:00
spencerrlongg
d18aa1db98 some more cleanup + tests 2024-03-20 15:18:15 -05:00
spencerrlongg
fdf0be09db all tests passing 2024-03-20 13:43:01 -05:00
Spencer Long
b4b4927370
Merge branch 'develop' into bug/sc-24884 2024-03-20 12:36:39 -05:00
snipe
321414f6e3 Updated comment
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 12:38:48 +00:00
snipe
7787fe42c8 Added avif to helpers
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 12:30:28 +00:00
snipe
3b66912742 Fixed #14460 - added support for avif
Signed-off-by: snipe <snipe@snipe.net>
2024-03-20 12:25:02 +00:00
spencerrlongg
0ffceb9691 some notes and a little progress 2024-03-20 00:07:52 -05:00
spencerrlongg
1e810d2426 most tests now passing, still one broken 2024-03-19 19:47:26 -05:00
spencerrlongg
c0110e7f29 some more tests and refinement 2024-03-19 19:27:35 -05:00
Godfrey M
62745923cf fixes API location delete 2024-03-19 15:25:28 -07:00
Godfrey M
090466123f add withCount to query instead 2024-03-19 15:18:18 -07:00
Godfrey M
38a3e36cd6 fixes translation usage 2024-03-19 14:32:21 -07:00
Godfrey M
e8dc634a40 fixes translation usage 2024-03-19 14:30:53 -07:00
Godfrey M
b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
Godfrey M
57f5d4a570 deleted_msg saves to db 2024-03-18 10:45:47 -07:00
Godfrey M
4588393b76 adds declined msg to mail notif, updates lang files and checkout acceptance controller 2024-03-18 10:25:55 -07:00
snipe
7bae4c39c6
Merge pull request #14401 from uberbrady/fix_locale_warning
Fix [sc-25008] - correct and improve legacy language warnings
2024-03-14 15:42:28 +00:00
snipe
cce8cb4f5e Move requestable scope below sorting, etc
Signed-off-by: snipe <snipe@snipe.net>
2024-03-14 13:24:22 +00:00
spencerrlongg
f6ab0f8f46 lots of cleanup to do, but this DOES work 2024-03-13 15:57:10 -05:00
spencerrlongg
04d7884af8 some more testing stuff 2024-03-12 23:17:40 -05:00
Marcus Moore
0fcf223960
Add minimal validation for asset_tags 2024-03-12 12:00:10 -07:00
spencerrlongg
eb8f1dd553 some cleanup 2024-03-09 12:29:26 -06:00
spencerrlongg
c8341d9dc4 aha, got it working. 2024-03-08 19:48:47 -06:00
spencerrlongg
b239b3a4db some good progress, lots of testing needs to be done on the new inclusion of SubstituteBindings 2024-03-08 18:24:41 -06:00
Brady Wetherington
a2e70dd6b2 Fix [sc-25008] - correct and improve legacy language warnings
The legacy language warning was misfiring when a user's language
didn't match the APP_LOCALE from .env.

Additionally, we weren't properly warning when the legacy-language
came from Settings or from the user themselves. Both of which should
be impossible but still probably not a bad idea to warn on it, anyways
2024-03-08 14:04:21 +00:00
snipe
5cf10cec34 Remloved unneeded validation message
Signed-off-by: snipe <snipe@snipe.net>
2024-03-07 23:40:30 +00:00
Marcus Moore
f270f30728
Redirect if no assets are returned from query 2024-03-07 12:30:08 -08:00
snipe
4231058aa1
Merge pull request #14371 from Godmartinz/RB17900_notification_bug
Adds User email check when sending Asset acceptance reminder
2024-03-07 10:18:19 +00:00
Godfrey M
c9d54baa10 bulk actions are handled before sorting 2024-03-05 15:47:52 -08:00
Brady Wetherington
5b9120ba6c Merge branch 'develop' into snipeit_v7_laravel10 2024-03-05 19:22:37 +00:00
Godfrey M
6c3a668400 checks to see if a user has an email before sending them a reminder email. 2024-03-05 10:30:24 -08:00
spencerrlongg
ad0f873ece rm validation stuff 2024-03-05 11:58:00 -06:00
spencerrlongg
eac01868ca not all working, but pushing to work on something else 2024-03-05 11:02:55 -06:00
snipe
19e0fb7955 Reverting CSP change
Signed-off-by: snipe <snipe@snipe.net>
2024-03-01 12:25:14 +00:00
snipe
93e69ab0c6 Removed unsafe-inline and unsafe-eval
Signed-off-by: snipe <snipe@snipe.net>
2024-03-01 11:44:49 +00:00
snipe
aaae952acb Use SVG cleaner on favicons
Signed-off-by: snipe <snipe@snipe.net>
2024-03-01 10:17:57 +00:00
akemidx
eb0657c953
Merge branch 'develop' into bug/sc-24812 2024-02-28 17:22:16 -05:00
snipe
7c3d8b896b Updated asset transformers/presenters to display requestable status
Signed-off-by: snipe <snipe@snipe.net>
2024-02-28 14:59:55 +00:00
snipe
a4941031cb
Merge pull request #14260 from marcusmoore/chore/sc-24808
Added tests around asset check in and added missing actions to the api controller action
2024-02-28 13:34:12 +00:00
snipe
9fd6aea325
Merge pull request #14281 from Godmartinz/preview-label-fields
Added better label previews with the new label engine
2024-02-28 11:48:05 +00:00
snipe
a52181c995
Merge pull request #14283 from akemidx/bug/sc-24788
FIXED: Checked in Assets Did Not Show in Custom Report when Selecting a Valid Checked Out Date
2024-02-28 11:47:46 +00:00
snipe
ee75df0f0a
Merge pull request #14346 from snipe/feature/sc-18728
Added `min_amt` functionality to licenses
2024-02-28 11:26:25 +00:00
snipe
a059a42799 Added use Auth to API controller
Signed-off-by: snipe <snipe@snipe.net>
2024-02-28 11:14:48 +00:00