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
Marcus Moore
0fcf223960
Add minimal validation for asset_tags
2024-03-12 12:00:10 -07: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
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
snipe
4ffb7790df
Added min_amt to API transformer/presenter
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-28 11:07:18 +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
snipe
a184b4e67c
Nicer UI for history importer
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-23 11:40:10 +00:00
Marcus Moore
4caadcfa19
Clear pending checkout acceptances when checking in asset via api
2024-02-22 13:33:16 -08:00
Marcus Moore
dba837b1d2
Move location migration logic to trait
2024-02-22 13:21:52 -08:00
Marcus Moore
714fc63050
Have legacy locations updated upon api asset checkin
2024-02-22 13:14:30 -08:00
Marcus Moore
2df026bcb5
Allow updating asset default location when checking in asset via api
2024-02-22 12:40:14 -08:00
spencerrlongg
14358651e4
pushing to test other branches
2024-02-22 13:28:23 -06:00
snipe
f04aeb9f2b
Fixed spacing
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-22 18:31:02 +00:00
snipe
dc902e7a5a
Fixed return type
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-22 18:30:23 +00:00
snipe
4fc66e19bb
Check for activeFile before trying to get header
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-22 18:28:01 +00:00
snipe
cb78451d6c
Made website searchable on users table
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-22 16:13:54 +00:00
snipe
e8ad8a7448
Added email, phone icons
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-22 14:48:01 +00:00
snipe
3351998efd
Only send notification if the item is assigned to a person
...
Signed-off-by: snipe <snipe@snipe.net>
2024-02-22 12:03:07 +00:00
spencerrlongg
20dbacd22f
store good, update needs work
2024-02-21 21:33:34 -06:00
Marcus Moore
aa2632fe46
Merge branch 'develop' into chore/sc-24808
2024-02-21 12:33:06 -08:00
Brady Wetherington
8f2843bfcf
Merge branch 'develop' into snipeit_v7_laravel10
...
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
2024-02-21 20:22:28 +00:00
