DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 06:29:47 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15064 commits 101 branches 268 tags 288 MiB
Commit graph

3063 commits

Author SHA1 Message Date
Scarzy 194853d860 Remove a redundant line 2024-05-29 22:01:48 +01:00
Scarzy 92670d5711 Add the ability to list files for an asset 2024-05-29 22:01:48 +01:00
Scarzy 8a2ea971e1 Add an API assets files controller 
Based heavily on the Assets assets files controller.
Added errors related to to the files management.
Added the API endpoints for file upload and show, but only upload is
currently tested/works.
 2024-05-29 22:01:48 +01:00
snipe 12e107a71b
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout 
Bulk Consumable Checkout
 2024-05-29 19:42:25 +01:00
snipe df1cef59d5 Fixes path for redirect response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 18:01:40 +01:00
snipe 92ba889cae Updated/removed facades 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:53:51 +01:00
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
bryanlopezinc 5d01a06245 Reduce IDE errors in App\Http\Controllers\SettingsController 2024-05-29 08:07:49 +01:00
Marcus Moore 4c78da3bbf
Re-add json encoding of permissions 2024-05-28 13:03:09 -07:00
snipe b1cb9259da Re-use total to avoid duplicate count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 18:01:47 +01: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
snipe 485caf1d92
Merge pull request #14755 from marcusmoore/chore/sc-25103/add-tests-around-asset-checkout 
Added tests around asset checkout
 2024-05-25 11:33:33 +01:00
Spencer Long cdb1140f10
Merge branch 'develop' into bug/sc-24884 2024-05-23 13:53:00 -05:00
snipe 8b3ff5a82d Handle potentially deleted admin users in license export 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-23 08:39:15 +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 4bb7c1701f Fiddled with storage facade a little more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:44:49 +01:00
snipe 5fd0f56258 Use proper storage facade for checking if the file exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:38:49 +01:00
snipe 37d7e89e93 Fixed error message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:29:43 +01:00
snipe 3ab197075a Nicer handling of erroring when filename+log do not match 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:20:03 +01:00
snipe bb96a190fd Moved validator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 12:34:48 +01:00
Godfrey M f2693ee957 conditionally fixed redirect select option 2024-05-21 14:08:35 -07: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
Godfrey M a53f89cd2c remove license checkout changes p2 2024-05-20 10:26:45 -07:00
Godfrey M 280c03dcad remove license checkout changes 2024-05-20 10:25:59 -07:00
Godfrey M e70fb42f87 remove license redirects 2024-05-20 10:22:01 -07:00
Brady Wetherington f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
snipe 771c85e347 Translated account save message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:31 +01:00
snipe 54b24434e1 Set file name variable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 19:56:58 +01:00
snipe 81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form 2024-05-16 16:13:21 +01:00
snipe 09914f508f Removed more debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:16:52 +01:00
snipe de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance 
Adds a note text area to asset acceptances/declines
 2024-05-16 15:06:05 +01:00
Godfrey M fb9a5f928f removed license changes 2024-05-15 16:39:26 -07:00
snipe 55281313d8
Merge pull request #14474 from Godmartinz/asset-location-update-bug 
Fixed user assets not updating when a user changes location
 2024-05-15 19:20:14 +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 c1d5b8713b Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 8310b91e00 Use UploadFileRequest for audit files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe e5653eaa93 Save new data 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +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 eb09a99eb0
Merge pull request #14707 from spencerrlongg/bug/sc-24912 
Bulk Edit Tests and Tweaks
 2024-05-15 11:22:31 +01:00
Godfrey M dc418a7033 need to make variables names uniform 2024-05-14 14:09:54 -07:00
Godfrey M 15cc4345ab adds dynamic redirects to Assets 2024-05-14 13:25:52 -07:00
Godfrey Martinez 5272824d85
Merge branch 'develop' into asset-location-update-bug 2024-05-13 10:47:25 -07:00
snipe 9bce0f2ff7 Format fix 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-13 18:19:14 +01:00
spencerrlongg ad2ba252ee two new test 2024-05-07 15:11:33 -05:00
spencerrlongg 17ef20ea92 alright, in a working place 2024-05-07 14:08:47 -05: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
Godfrey M c94a7613ca dropdown redirect options, helper function and session variable added 2024-05-02 12:16:20 -07:00
snipe 4224bc0c43 Removed extra settings param 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:36:57 +01:00
spencerrlongg e177993bcc notes and some playing around, push for eod 2024-05-01 16:57:11 -05:00
spencerrlongg 25480293dc change keys to values, add test 2024-04-30 18:03:26 -05:00
snipe 103809b65f Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:01:43 +01:00
snipe 3f04afee5c Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:26 +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 2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button 
Added a License Export function and button
 2024-04-24 04:42:56 +01:00
spencerrlongg b11c900a4c fix bracket, + overwrite required rulesets 2024-04-23 16:29:07 -05:00
akemidx ac4aa97103 develop reheading 2024-04-23 17:05:50 -04:00
akemidx 0bc93c6a1e space 2024-04-23 15:31:37 -04:00
Spencer Long 53ccd196d7
Merge branch 'develop' into bug/sc-24884 2024-04-23 13:57:59 -05:00
snipe 685f1cbfb8
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels 
Removed encrypted fields from label options
 2024-04-23 13:31:38 +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
Godfrey M 96b3af7cbc fixed view from sending all custom fields 2024-04-22 18:27:34 -07:00
Godfrey M 5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00
akemidx 0d049a0be7 conflict resolution 2024-04-22 20:09:40 -04:00
akemidx 01c24ab4cd translating text 2024-04-22 19:16:14 -04:00
Godfrey M 14ddf36d46 removed two duplicate translations 2024-04-22 10:43:11 -07:00
Godfrey M 25f1167c9d adds company scoping to license export 2024-04-22 10:38:55 -07:00
snipe 2aa3ce15bd Removed escaping on notes for file uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-22 14:55:02 +01:00
akemidx e8d9701a26 array key existing 2024-04-17 19:16:25 -04: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 9bb15aaf1b Added individual gates to keep response consistent with other company-ed things 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:57:49 +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 ed0a441e4d Refactor destroy method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:52:03 +01:00
snipe 460693c153 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:40:13 +01:00
snipe f54a94bd4c Refactorered methods 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:40:00 +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
Marcus Moore 4434de6241
Add test case 2024-04-10 15:47:26 -07:00
Godfrey M a2bca0e358 fixed comments 2024-04-10 15:05:21 -07:00
Marcus Moore 7dbf8a8a8e
Add tests for asset and location check out 2024-04-10 13:28:52 -07:00
Godfrey M 0849262243 fixed notes 2024-04-10 12:19:34 -07:00
Godfrey M 17095feb33 fix typo 2024-04-10 12:15:48 -07:00
Godfrey M f42ae46338 exports all licenses 2024-04-10 12:14:44 -07:00
Godfrey M e2679852ce added export button, half the logic for export method 2024-04-10 11:31:30 -07:00
Marcus Moore deaba46e1c
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-04-10 11:01:35 -07:00
snipe adacdc038d Apply company scoping for users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-10 12:34:32 +01:00
snipe e11287ec25 Redirect on checkin if the asset is already checked in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 15:00:55 +01:00
snipe a72d4e5dc1 Fixed ambiguous id clause in custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 14:23:58 +01: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
Godfrey M 08f9aae8ae adds note to log listener and checkout accept notif 2024-04-03 11:59:47 -07:00
Godfrey M ce1d677cdc adds note to acceptance 2024-04-03 11:36:03 -07:00
Godfrey M bb2c73348d only grabs custom Fields that are not encrpyted 2024-04-03 11:03:58 -07:00
Godfrey M 4327653d70 remove db cleaner for encrypted selections 2024-04-03 10:57:41 -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
akemidx 721902c2d4 committed for later 2024-03-28 16:44:44 -04:00
snipe 1f2d30ebf4 Check that the array key exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 12:25:29 +00:00
akemidx e6b366020a lots of attempts and syntax, but no go 2024-03-27 19:05:59 -04: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
snipe 545a185614
Merge pull request #14262 from akemidx/bug/sc-24812 
Last Checkin Date added to Hardware View and Index
 2024-03-27 19:02:25 +00: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
Godfrey M aa8af2220c trying to remove an encrypted field but not all fields 2024-03-26 16:10:08 -07:00
snipe ae403da8c1
Merge pull request #14502 from marcusmoore/bug/sc-25004/pwd_secure_complexity-validation 
Added validation around `pwd_secure_complexity`
 2024-03-26 20:05:04 +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
Marcus Moore 5815607924
Add validation for pwd_secure_complexity 2024-03-25 17:45:41 -07:00
spencerrlongg 7e4a0eedf0 rm dumb note 2024-03-25 10:46:26 -05:00
Godfrey M 633249b08a user assets get updated when a user changes location 2024-03-21 15:15:40 -07:00
Godfrey M 21c3b1fbd2 rename declined message to note, increased width of textarea 2024-03-21 14:03:25 -07: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 c4b7e77498
Merge pull request #14089 from spencerrlongg/bug/escaped_quotes_in_listbox 
Use `htmlentities()` instead of `htmlspecialcharacters()` on Custom Field Listbox Values
 2024-03-21 12:55:25 +00:00
snipe 91c7180bfd
Merge pull request #14469 from snipe/feature/sc-19515/2fa_reset_log 
Added 2FA reset log entry
 2024-03-21 12:52:22 +00:00
snipe 7c39f516b9
Merge pull request #14421 from marcusmoore/fixes/add-minimal-validation-around-asset-tags 
Adds a minimal amount of validation around asset_tags in AssetsController
 2024-03-21 00:04:44 +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
Marcus Moore 530291f81c
Implement some tests 2024-03-20 14:28:27 -07: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
Godfrey M 090466123f add withCount to query instead 2024-03-19 15:18:18 -07:00
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 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
Marcus Moore 0fcf223960
Add minimal validation for asset_tags 2024-03-12 12:00:10 -07: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
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
spencerrlongg eac01868ca not all working, but pushing to work on something else 2024-03-05 11:02:55 -06: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 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
spencerrlongg c025e25839 just the basics and notes, pushing to keep track 2024-02-26 14:32:50 -06: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 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
Godfrey M 14c86d447b added filter to collectifunction 2024-02-21 11:38:03 -08:00
Godfrey M bee016e0be keeps example values in the example preview, fixes indent 2024-02-21 09:31:01 -08:00
snipe 54552fc95c
Merge pull request #14192 from inietov/fixes/api_issue_checkin_licenses 
Fixed #14183  API /hardware/:id/checkin doesn't return Licenses
 2024-02-21 11:35:06 +00:00
akemidx 9397372f87 permissions, but they are now all in their own column because reasons??? 2024-02-20 18:48:17 -05:00
akemidx 8bbf6da052 user block, trying to pick out ONLY permissions we wanna see 2024-02-20 18:25:41 -05:00
snipe 04891c7c61 Eager load relations to determine 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 22:25:00 +00:00
spencerrlongg 26728a85ad this seems to work for patches 2024-02-20 13:18:40 -06:00
spencerrlongg c6d85a1b0b allows arrays on checkbox values 2024-02-20 12:23:24 -06:00
snipe 71610fb20f
Merge pull request #14304 from snipe/feature/sc-24018 
Added ability to bulk delete locations
 2024-02-20 18:14:51 +00:00
snipe 1797480128 Few more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:56 +00:00
snipe 972b198248 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:16 +00:00
snipe a32c679519 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:31 +00:00
snipe 1e602793b2 Added manager ID to filter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:23 +00:00
snipe 30f9acfcf3 Disallow uploads in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 16:11:17 +00:00
snipe cb5b691ec1 Check that the model exists before trying to access properties 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 15:34:57 +00:00
snipe 8f8edd4126 Added /backups/latest endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 14:35:09 +00:00
snipe 10bb844087 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 14:34:51 +00:00
snipe ba3baabb50 Fixed @return 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 14:34:36 +00:00
snipe c76fbe4edb Return 404 if download file isn’t found 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 13:05:44 +00:00
snipe 9847934de9 Better handle large downloads on backup API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 12:20:37 +00:00
akemidx 4dd479dad7 formatting 2024-02-15 19:59:26 -05:00
akemidx d01e1e8eeb query works, but still only shows the asset once even if it's been checked out multiple times 2024-02-15 19:56:08 -05:00
akemidx e3ef737ac4 query first go 2024-02-15 19:15:27 -05:00
Godfrey M 69317fb403 Marcus is a beast and condensed everything into 4 lines 2024-02-15 13:26:47 -08:00
Godfrey M 1b80c8938a removed unnecessary if statement 2024-02-15 13:04:00 -08:00
Godfrey M dc77c01fd3 removes spacing 2024-02-15 13:00:38 -08:00
Godfrey M 83474d6e59 moves the array manipulation up the page where it should be 2024-02-15 12:59:47 -08:00
Godfrey M 529310c93a fixed typo in comment 2024-02-15 12:41:31 -08:00
Godfrey M 70f26f33a5 does a collect and map instead of a for loop for the array solution 2024-02-15 12:34:09 -08:00
Godfrey M 414bc10c40 removes the double for loop with a better solution 2024-02-15 12:02:08 -08:00
Godfrey M 250b0a7afb gives a better example with custom fields in label preview 2024-02-15 11:50:41 -08:00
snipe d8b1eec91b
Merge pull request #14197 from inietov/fixes/component_licenses_checkouts_not_displayed_in_asset_history 
Fixes #14010 Adds Components and Licenses logs to Assets history view
 2024-02-15 09:57:46 +00:00
snipe 13d2af2155 Fixed ambiguous query on supplier_id in maintenances 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 09:51:14 +00:00
akemidx 232fad0145 query and progress notes 2024-02-14 20:00:23 -05:00
Godfrey M 5cbcac28b1 adds custom fields as an example in label settings 2024-02-14 16:53:38 -08:00
spencerrlongg 115e0fc119 implode submitted arrays to save 2024-02-14 13:15:23 -06:00
Marcus Moore d7aed2edc9
Remove unneeded code 2024-02-14 11:10:45 -08:00
Marcus Moore 7bfd02054b
Remove duplicate authorization check 2024-02-14 10:48:41 -08:00
spencerrlongg 1ceb703129 rm var 2024-02-14 12:44:09 -06:00
spencerrlongg d9c61fdb02 validation msg 2024-02-14 11:52:25 -06:00
snipe 8a4c90ade8 Check that the asset is not deleted 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:25 +00:00
snipe 35a70988cb Added sorting by status label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:39 +00:00
snipe e5ee9760c0 I don’t think we use these anyore because of the modifiers on date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:47:33 +00:00
snipe 7868a8c174 Added serial for API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:47:13 +00:00
spencerrlongg 25241542d2 progress, going to sleep 2024-02-14 02:12:31 -06:00
akemidx c5e8d1c276 custom report tinker 2024-02-13 17:09:51 -05:00
akemidx 4093327b7f adding in Last Checkin Date to Hardware view and index 2024-02-13 16:52:12 -05:00
akemidx 4a57cfaf3e commenting out the nulling of last checkout date on checkin page and API 2024-02-13 16:21:18 -05:00
snipe a76a69d085 Fixed incorrect string for location not existing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-13 20:23:32 +00:00
spencerrlongg d55358652b cleanup for pr 2024-02-13 13:45:56 -06:00
akemidx f7d0cecdac permissions query starto 2024-02-12 19:01:06 -05:00
snipe 111daffc17
Merge pull request #14188 from spencerrlongg/bug/14146 
Fixes Default Location Being Set During Asset Creation and Checkout
 2024-02-10 11:47:46 +00:00
snipe 3868e711f4 Return null if asset was hard-deleted/purged 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 21:08:07 +00:00
snipe 479abd5231 Do not try to return a serial if the item doesn’t exist 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:53:33 +00:00
snipe 55b3050ca8 Re-applied previous withTrashed PR 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:37:18 +00:00
snipe 84f8eee869
Revert "Fixed barcodes crashing if asset was deleted" 2024-02-09 20:35:45 +00:00
snipe fa47707974 Use withTrashed() to get the barcode on deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:26:49 +00:00
Brady Wetherington 9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +00:00