3
0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-08 01:15:50 +00:00
Commit Graph

333 Commits

Author SHA1 Message Date
cdb1140f10 Merge branch 'develop' into bug/sc-24884 2024-05-23 13:53:00 -05:00
c137fafa97 Updated language
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 18:10:43 +01:00
cb22a3d556 Updated comments again :-/
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 17:52:50 +01:00
c7accb4599 Added comments
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 17:38:42 +01:00
3c4098038d Fail early if no tag
Signed-off-by: snipe <snipe@snipe.net>
2024-05-15 16:33:47 +01:00
4224bc0c43 Removed extra settings param
Signed-off-by: snipe <snipe@snipe.net>
2024-05-02 12:36:57 +01:00
103809b65f Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 21:01:43 +01:00
6dc9ccffcd Refactor api for handling audit/expected checkins
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 18:56:57 +01:00
bf058bd5c6 Use updated scopes
Signed-off-by: snipe <snipe@snipe.net>
2024-04-26 14:02:56 +01:00
b11c900a4c fix bracket, + overwrite required rulesets 2024-04-23 16:29:07 -05:00
53ccd196d7 Merge branch 'develop' into bug/sc-24884 2024-04-23 13:57:59 -05:00
67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +01:00
0a90df2b14 alright conflicts resolved 2024-04-03 14:40:14 -05:00
4ab75c1c03 Merge branch 'develop' into bug/sc-24884 2024-04-03 14:08:41 -05:00
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
86677b5f13 Make last_checkin sortable
Signed-off-by: snipe <snipe@snipe.net>
2024-03-27 20:37:25 +00:00
cec84b857b fixed last audit date + test 2024-03-27 14:39:23 -05:00
013463aafc Merge branch 'develop' into bug/sc-24884 2024-03-27 12:45:45 -05:00
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
7e4a0eedf0 rm dumb note 2024-03-25 10:46:26 -05:00
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
be282dd038 resolve a couple issues 2024-03-21 09:26:45 -05:00
e7b9903341 delete some extra lines 2024-03-20 15:29:06 -05:00
d18aa1db98 some more cleanup + tests 2024-03-20 15:18:15 -05:00
b4b4927370 Merge branch 'develop' into bug/sc-24884 2024-03-20 12:36:39 -05:00
0ffceb9691 some notes and a little progress 2024-03-20 00:07:52 -05:00
1e810d2426 most tests now passing, still one broken 2024-03-19 19:47:26 -05:00
cce8cb4f5e Move requestable scope below sorting, etc
Signed-off-by: snipe <snipe@snipe.net>
2024-03-14 13:24:22 +00:00
04d7884af8 some more testing stuff 2024-03-12 23:17:40 -05:00
eb8f1dd553 some cleanup 2024-03-09 12:29:26 -06:00
c8341d9dc4 aha, got it working. 2024-03-08 19:48:47 -06:00
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
ad0f873ece rm validation stuff 2024-03-05 11:58:00 -06:00
eac01868ca not all working, but pushing to work on something else 2024-03-05 11:02:55 -06:00
7c3d8b896b Updated asset transformers/presenters to display requestable status
Signed-off-by: snipe <snipe@snipe.net>
2024-02-28 14:59:55 +00:00
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
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
5084e5d3ef Improve variable type 2024-02-27 12:23:26 -08:00
a5516e3511 Improve trait name 2024-02-27 12:06:29 -08:00
0e460baf82 Improve readability 2024-02-27 12:03:36 -08:00
c025e25839 just the basics and notes, pushing to keep track 2024-02-26 14:32:50 -06:00
4caadcfa19 Clear pending checkout acceptances when checking in asset via api 2024-02-22 13:33:16 -08:00
dba837b1d2 Move location migration logic to trait 2024-02-22 13:21:52 -08:00
714fc63050 Have legacy locations updated upon api asset checkin 2024-02-22 13:14:30 -08:00
2df026bcb5 Allow updating asset default location when checking in asset via api 2024-02-22 12:40:14 -08:00
14358651e4 pushing to test other branches 2024-02-22 13:28:23 -06:00
20dbacd22f store good, update needs work 2024-02-21 21:33:34 -06:00
aa2632fe46 Merge branch 'develop' into chore/sc-24808 2024-02-21 12:33:06 -08:00
26728a85ad this seems to work for patches 2024-02-20 13:18:40 -06:00
c6d85a1b0b allows arrays on checkbox values 2024-02-20 12:23:24 -06:00