Commit graph

5147 commits

Author SHA1 Message Date
snipe
d64ee42ec3 Wrapped in a transaction
Signed-off-by: snipe <snipe@snipe.net>
2024-03-07 15:04:08 +00:00
snipe
fe08f39900 Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
2024-03-07 14:43:06 +00:00
snipe
5123ab57c9 Added console command to encrypt previously unencrypted fields
Signed-off-by: snipe <snipe@snipe.net>
2024-03-07 14:40:52 +00:00
snipe
4b13fa45c5
Merge pull request #14320 from Godmartinz/default_label_bug
Default label setup with custom fields
2024-03-07 10:33:43 +00: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
ff7d25c0f2 simplified 1dbarcode logic 2024-03-06 15:30:53 -08:00
Godfrey M
5f0b7f328c if statement order change 2024-03-06 15:24:03 -08:00
Godfrey M
6559581bad conditions 1dbarcode to populate based on settings 2024-03-06 15:10:42 -08:00
Godfrey M
d78262f52b resolved merge conflicts 2024-03-06 14:48:47 -08:00
snipe
a85e2f7aad
Merge pull request #14372 from snipe/bug/sc-24158
Added route parameter
2024-03-06 19:45:33 +00:00
Godfrey M
c9d54baa10 bulk actions are handled before sorting 2024-03-05 15:47:52 -08:00
Godfrey M
940f54dab1 revert some changes 2024-03-05 15:45:35 -08:00
Godfrey M
d83827a44e bulk actions are handled before sorting 2024-03-05 15:43:41 -08:00
snipe
23f8e35716 Added route parameter
Signed-off-by: snipe <snipe@snipe.net>
2024-03-05 20:39:56 +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
Godfrey M
95ef3a336b Merge branch 'develop' into default_label_bug 2024-03-04 12:03:54 -08:00
Godfrey M
e926db76a0 fixes inconsistencies with generating labels 2024-03-04 10:26:38 -08: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
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
4ab7112988 Added validation and fillable attributes for min_amt
Signed-off-by: snipe <snipe@snipe.net>
2024-02-28 11:08:47 +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
dff7c43aed Added minimum account check for licenses
Signed-off-by: snipe <snipe@snipe.net>
2024-02-28 11:05:02 +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
Godfrey M
ef52777ffb removed conditional 2024-02-27 11:33:00 -08:00
Godfrey M
b67ceab849 fields appear in preview, but not bulk generate labels 2024-02-27 11:29:19 -08: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
spencerrlongg
b6fa6cba22 note before switching tasks 2024-02-22 15:01:14 -06:00
Marcus Moore
2df026bcb5
Allow updating asset default location when checking in asset via api 2024-02-22 12:40:14 -08:00
Godfrey M
6ee24a7527 remove unnecessary code reformat 2024-02-22 12:36:27 -08:00
Godfrey M
e2dcee1959 cleans up dead code 2024-02-22 12:26:57 -08:00
Godfrey M
4fbea9512f puts textY inside of the forloop 2024-02-22 12:08:47 -08:00
Godfrey M
b7850ab839 puts textY outside of the forloop 2024-02-22 12:08:04 -08:00
Godfrey M
c0215baca5 minor changes 2024-02-22 11:41:04 -08:00