DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-12 16:44:08 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
13671 commits 97 branches 266 tags 292 MiB
Commit graph

1010 commits

Author SHA1 Message Date
snipe f17162c2e2 Use artisan facade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:40:05 +01:00
snipe fb233c0aa4 Cleaned up facade names and references 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:38:15 +01:00
Marcus Moore 4c78da3bbf
Re-add json encoding of permissions 2024-05-28 13:03:09 -07:00
snipe 03b5c2e246 Fixed bad translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:21:28 +01:00
Brady Wetherington 8df9007a8e Merge branch 'snipeit_v7_laravel10' into develop 2024-05-27 18:08:27 +01:00
Marcus Moore 8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-05-22 16:09:27 -07:00
Marcus Moore 6d104251b3
Remove todo 2024-05-22 15:40:54 -07:00
Marcus Moore f16c79bb9a
Improve event assertions 2024-05-22 15:38:23 -07:00
Marcus Moore c7fa2c04ad
Add scenario 2024-05-22 13:33:12 -07:00
Marcus Moore 8ca882d1c8
Complete a scenario 2024-05-22 13:23:49 -07:00
Brady Wetherington 4adbd7af4c Merge branch 'develop' into snipeit_v7_laravel10 2024-05-22 21:02:11 +01:00
snipe bb96a190fd Moved validator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 12:34:48 +01:00
snipe 34f1ea1c0e Re-order gating and refactor group syncing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-21 10:00:49 +01:00
Brady Wetherington f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
snipe c137fafa97 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 18:10:43 +01:00
snipe cb22a3d556 Updated comments again :-/ 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 17:52:50 +01:00
snipe c7accb4599 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 17:38:42 +01:00
snipe 3c4098038d Fail early if no tag 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe 8c327e6523 Handle user not found properly 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 19:16:56 +01:00
snipe d942b8f1fb Fixed alias names 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 17:40:35 +01:00
snipe 49dc9767b6 Added debugging :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 15:54:43 +01:00
snipe 410b547f3c Added users and locatipon count to API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 12:07:28 +01:00
Brady Wetherington 5b02a43957 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-06 18:44:03 +01:00
snipe 4224bc0c43 Removed extra settings param 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:36:57 +01:00
snipe 103809b65f Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:01:43 +01:00
snipe 6dc9ccffcd Refactor api for handling audit/expected checkins 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:56:57 +01:00
snipe bf058bd5c6 Use updated scopes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:56 +01:00
Brady Wetherington 3f5c5cbe82 Merge branch 'develop' into snipeit_v7_laravel10 2024-04-24 16:24:43 +01:00
snipe bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields 
Re-enabled updating encrypted custom fields via API [sc-41465]
 2024-04-23 10:20:55 +01:00
snipe 4450351b75 Only sync groups if API user is superadmin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 11:06:50 +01:00
snipe 65dd729e19 Additional gates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:57:20 +01:00
Brady Wetherington 67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +01:00
snipe 710370ac24 Added scoping for destroy 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:58:25 +01:00
snipe 460693c153 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:40:13 +01:00
Marcus Moore 5567a1e9ac
Formatting 2024-04-10 17:37:11 -07:00
Marcus Moore f28a82de71
Implement some tests, scaffold others 2024-04-10 17:27:07 -07:00
Marcus Moore 7c2fae7b9d
Scaffold api test cases 2024-04-10 17:08:45 -07: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
Robert Spadaro ccd00caa70 Wrap where logic in additional where statement to protect appended params 2024-03-27 15:36:00 -04: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
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
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