Commit graph

1240 commits

Author SHA1 Message Date
Marcus Moore
7c2fae7b9d
Scaffold api test cases 2024-04-10 17:08:45 -07:00
spencerrlongg
0a90df2b14 alright conflicts resolved 2024-04-03 14:40:14 -05:00
Spencer Long
4ab75c1c03
Merge branch 'develop' into bug/sc-24884 2024-04-03 14:08:41 -05:00
Brady Wetherington
65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10
Hopefully, last merge?
2024-04-02 20:34:04 +01:00
snipe
f42e5d5292 Reverting the store/update asset API responses for now
This currently breaks the Jamf integration - need a better longer term plan.

Signed-off-by: snipe <snipe@snipe.net>
2024-03-28 21:58:49 +00:00
snipe
86677b5f13 Make last_checkin sortable
Signed-off-by: snipe <snipe@snipe.net>
2024-03-27 20:37:25 +00:00
spencerrlongg
cec84b857b fixed last audit date + test 2024-03-27 14:39:23 -05:00
Robert Spadaro
ccd00caa70 Wrap where logic in additional where statement to protect appended params 2024-03-27 15:36:00 -04:00
Spencer Long
013463aafc
Merge branch 'develop' into bug/sc-24884 2024-03-27 12:45:45 -05:00
snipe
8bc9688d71 Added ability to filter on category ID and model ID from user’s asset API
Signed-off-by: snipe <snipe@snipe.net>
2024-03-27 16:04:00 +00:00
snipe
850f85ff59
Merge pull request #14369 from spencerrlongg/bug/sc-24343
Add new validator for custom field checkboxes and fix asset model default updates
2024-03-26 19:22:29 +00:00
snipe
3ced85080a Fixed #14495 - Allow user_id to be passed to limit to only specific admins
Signed-off-by: snipe <snipe@snipe.net>
2024-03-26 14:45:20 +00:00
spencerrlongg
7e4a0eedf0 rm dumb note 2024-03-25 10:46:26 -05:00
snipe
828b84084d Added validation for last_audit_date and next_audit_date
Signed-off-by: snipe <snipe@snipe.net>
2024-03-21 18:29:38 +00:00
spencerrlongg
be282dd038 resolve a couple issues 2024-03-21 09:26:45 -05: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
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
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
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
5b9120ba6c Merge branch 'develop' into snipeit_v7_laravel10 2024-03-05 19:22:37 +00: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
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
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
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
spencerrlongg
c025e25839 just the basics and notes, pushing to keep track 2024-02-26 14:32:50 -06: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
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
spencerrlongg
20dbacd22f store good, update needs work 2024-02-21 21:33:34 -06:00