spencerrlongg
|
be282dd038
|
resolve a couple issues
|
2024-03-21 09:26:45 -05:00 |
|
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 |
|
Spencer Long
|
b4b4927370
|
Merge branch 'develop' into bug/sc-24884
|
2024-03-20 12:36:39 -05: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 |
|
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
|
cce8cb4f5e
|
Move requestable scope below sorting, etc
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-14 13:24:22 +00: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 |
|
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
|
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 |
|
snipe
|
92b7c4b5ec
|
Allow sorting on min_amt
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 11:05:13 +00:00 |
|
snipe
|
9efbcbbd5e
|
Added min_amt to licenses
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 11:04:42 +00:00 |
|
snipe
|
31fa0a7044
|
Removed logging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 11:04:32 +00:00 |
|
snipe
|
0bd27d61b0
|
Added created_by to groups table
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-28 08:15:59 +00:00 |
|
Marcus Moore
|
5084e5d3ef
|
Improve variable type
|
2024-02-27 12:23:26 -08:00 |
|
Marcus Moore
|
a5516e3511
|
Improve trait name
|
2024-02-27 12:06:29 -08:00 |
|
Marcus Moore
|
0e460baf82
|
Improve readability
|
2024-02-27 12:03:36 -08:00 |
|
akemidx
|
5ffade663a
|
unstash
|
2024-02-26 18:41:58 -05:00 |
|
spencerrlongg
|
c025e25839
|
just the basics and notes, pushing to keep track
|
2024-02-26 14:32:50 -06:00 |
|
snipe
|
a184b4e67c
|
Nicer UI for history importer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-23 11:40:10 +00:00 |
|