DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 18:14:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
12920 commits 96 branches 267 tags 295 MiB
Commit graph

5098 commits

Author SHA1 Message Date
snipe db73f80058 Starting off 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-16 18:57:50 +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 aef45a90b2
Merge pull request #14278 from uberbrady/allowlist_and_db_prefix_for_restore 
Allowlist and db prefix for restore
 2024-02-15 14:50:44 +00:00
Brady Wetherington 6a78706a3e New 'sanitize' version of backup-restore tool. Optional. 2024-02-15 13:27:18 +00:00
snipe 8adfa8dd83 Change exceptions to warnings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 12:28:12 +00:00
snipe 6c9001df09 Changed log level in checkoutable listener to info 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 12:20:14 +00: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 b871813cfd
Merge pull request #14172 from spencerrlongg/bug/sc-23514 
Resolve Duplicate Activity Logs for Imports
 2024-02-15 09:54:43 +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
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
Godfrey M b136e9e29d fix the listener to fire when checking in 2024-02-14 09:16:20 -08:00
snipe 638071dadd Check the asset is not deleted when creating the permissions array 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:38 +00: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 71ebade641 Added serial and status to searchable relations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:59:10 +00:00
snipe b86b05c4fc Added serial and status fields to presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:55 +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 abc9ee22c6 Added serial and status to transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:48:02 +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
snipe 03df4cec45 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:46:43 +00: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
Brady Wetherington 955f75f733 Fixes for the prefix-guessing and sanitizing. 2024-02-13 16:45:24 +00:00
Brady Wetherington 70ef904951 Actually got this pretty close to being able to do a restore 2024-02-13 12:16:15 +00:00
Brady Wetherington fcf023e3d2 WIP: trying to get prefixing and sanitization working 2024-02-13 12:16:15 +00:00
Brady Wetherington 8c882ddead Starting to abstract out the SQL Streaming logic into its own class 2024-02-13 12:16:15 +00:00
Brady Wetherington 7d136f9970 Initial rough stabs at prefix removal and SQL sanitization 2024-02-13 12:16:15 +00:00
Marcus Moore 5b181ecea7
Remove old comment 2024-02-12 16:29:34 -08:00
Marcus Moore 728aaaab20
Ensure accessory check in emails are not sent when the setting is disabled 2024-02-12 16:22:59 -08: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
Godfrey Martinez 9dcd14a712
Merge branch 'develop' into general-hook_fix 2024-02-08 14:59:25 -08:00
Brady Wetherington 9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +00:00
snipe bf674a0f4d Removed backticks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-06 15:58:36 +00:00
snipe b170755c3d Switch to bulk updating to handle audit interval updates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-06 15:52:46 +00:00
snipe a43183ff96 Increased chunk 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-06 09:09:27 +00:00
snipe 3b36372a66
Merge pull request #14222 from marcusmoore/tests/company-get-id-for-current-user 
Added tests around getIdForCurrentUser method
 2024-02-05 22:04:08 +00:00
Marcus Moore 9e6e2de71e
Add docblock 2024-02-05 12:49:29 -08:00
snipe b49935701b Chunk data to reduce memory on large datasets when updating next_audit_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 20:48:24 +00:00
snipe 7b4020c5e9 Updated string paths for URL 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 19:09:16 +00:00
snipe 32c360f032 Re-added UI for load_remote 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:23:52 +00:00
snipe 1a480435de
Merge pull request #14190 from marcusmoore/bug/sc-24685 
Fixed consumable checkout via API not sending notification
 2024-02-05 17:16:57 +00:00
snipe 650aa25659
Merge pull request #14191 from Godmartinz/googlechat_webhook 
Added support for Google Chat notifications
 2024-02-05 17:10:54 +00:00
snipe f52b00256d
Merge pull request #14213 from snipe/fixes/orientate_on_exif 
Fixed FD-40296 - mobile uploads sometimes uploading with incorrect orientation
 2024-02-05 16:22:03 +00:00
snipe 5882d71f9b Fix company asset counts for dashboard widget 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 15:55:53 +00:00
snipe 3b948c7b7e Add orientate to image upload 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 14:29:43 +00:00
snipe d965fe759a Fixed #14211 - duplicate array key ldap_emp_num 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 12:28:24 +00:00
Ivan Nieto Vivanco 5e4a3379a9 Adds Components and Licenses logs to Assets history view 2024-02-01 01:35:25 -06:00
Godfrey M 8a5b469ff8 adds # to webhook channel trigger 2024-01-31 12:54:30 -08:00
Godfrey M ed06f32a7a adds # to webhook channel trigger 2024-01-31 12:53:56 -08:00
Godfrey M a876703f8f spacing 2024-01-31 10:48:48 -08:00
Godfrey M 01bb8d8c9a spacing 2024-01-31 10:48:23 -08:00
Godfrey M f452204d62 applies a conditional to have the the integration test button function properly 2024-01-31 10:47:25 -08:00
Ivan Nieto Vivanco 51ae485f20 When asset is checked-in the assigned licenses also are taken from the user 2024-01-30 19:44:38 -06:00
Godfrey M 0eabb147b2 adds google notif to consumable check out 2024-01-30 13:19:28 -08:00
Marcus Moore 2e0e39ccc8
Ensure notification is sent when consumable is checked out via api 2024-01-30 13:19:20 -08:00
spencerrlongg 63e733f0d6 changes from a note to a source 2024-01-30 15:14:59 -06:00
Godfrey M 2406d2cfdb adds google notifs to license seats check in and out 2024-01-30 13:14:24 -08:00
Godfrey M e074ca0bf9 adds google notifs to accessories check in and out 2024-01-30 12:57:45 -08:00
Marcus Moore 13c37e708f
Implement tests around consumable checkout 2024-01-30 12:43:20 -08:00
Godfrey M 87bce0c097 adds google notifs for asset check in and out 2024-01-30 12:38:17 -08:00
Godfrey M 22385a8e35 fix for general webhook not notifiying anymore 2024-01-30 10:47:18 -08:00
spencerrlongg d0a82adc3f changed condition 2024-01-29 20:44:26 -06:00
Marcus Moore 42ec2548c9
Fire event when accessory checked out via API 
Brings behavior in line with GUI controller
 2024-01-29 17:03:19 -08:00
Marcus Moore 7d45cfff2c
Ensure accessory available when checking out via api 2024-01-29 16:49:09 -08:00
Godfrey M dfa33f651a webhook test works 2024-01-29 12:58:09 -08:00
Godfrey M 30c2927987 merged develope 2024-01-29 11:21:00 -08:00
Godfrey M e8159d97fa changes 2024-01-29 11:12:25 -08:00
Brady Wetherington 401e1842ee Fixed pluralization bug due to dashed-locale names instead of underscored 
Our locale directories are named things like 'en-US'. But the pluralization
code used by Laravel (through Symfony) requires locale names to be
in the format en_US. This change introduces a new Translator,
SnipeTranslator, which is a tiny set of changes against the built-in
one. It additionally adds a SnipeTranslationServiceProvider, which
loads up the new Translator.
 2024-01-26 15:40:55 +00:00
spencerrlongg 2deba17d91 that's all of 'em 2024-01-25 20:04:02 -06:00
spencerrlongg 3574ef5bb9 a few more imports, component sample 2024-01-25 19:54:53 -06:00
spencerrlongg abf13f1619 revert spacing 2024-01-25 19:37:59 -06:00
spencerrlongg 4a7df470f0 this works 2024-01-25 19:34:41 -06:00
spencerrlongg c9101f4d97 initial work, not working yet 2024-01-25 18:18:24 -06:00
snipe d6c61e1429 Removed attribute assigning blank EOL as 0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-25 21:34:20 +00:00
snipe 85a158eaef
Merge pull request #14170 from uberbrady/saml_nonce_storage 
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute [FD-37019]
 2024-01-25 20:14:40 +00:00
Brady Wetherington b39b575fec Add table-check; add command-description for Artisan command 2024-01-25 20:07:18 +00:00
Brady Wetherington 81b8243e1d Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute 2024-01-25 19:53:24 +00:00
snipe ab926f2e33
Merge pull request #14153 from Godmartinz/ms_teams_webhook 
Added support for Microsoft Teams Notifications
 2024-01-25 08:27:17 +00:00
Marcus Moore f5dafc477a
Avoid unnecessary model hydration on asset model show page 2024-01-24 16:14:51 -08:00
Godfrey M 6e9a46e582 working on Chat integration test 2024-01-24 15:50:36 -08:00
Godfrey M c65b32bcdb removed translation fixed via method 2024-01-24 14:49:42 -08:00
Godfrey M 1d3124f89f adding a test variable for test methods 2024-01-24 14:38:45 -08:00
snipe 105d4899f5 Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 20:33:13 +00:00
Godfrey M ada1a593a4 add google placeholder 2024-01-24 11:29:32 -08:00
snipe ba680126bc Properly sort the results based on non-asset fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:09:06 +00:00
Godfrey M 00f07ac2ce add translations, brush up code 2024-01-24 10:38:06 -08:00
snipe 165f9545ac
Merge pull request #13924 from snipe/bug/sc-20167 
Set qty mutators
 2024-01-24 18:21:06 +00:00
snipe fff21416be
Merge pull request #14051 from akemidx/email_in_license_table 
Email in License Seat Table
 2024-01-24 15:37:43 +00:00
snipe 7668a6767d
Merge pull request #14102 from Godmartinz/seat-id-is-zero 
Fixed license seats id turning to zero when sorting by department
 2024-01-24 14:49:33 +00:00
snipe 661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations 
Adds translations for Label example
 2024-01-24 13:36:40 +00:00
snipe 49dc1dd37a
Merge pull request #14132 from marcusmoore/chore/sc-24501 
Improved radio button values in custom report form
 2024-01-24 13:22:48 +00:00
Brady Wetherington 3bc1b9038d Fix for LDAP syncing with base_dn and location_id and location 2024-01-24 11:54:29 +00:00
Godfrey M 49021d277c if not location add default location 2024-01-23 13:33:57 -08:00
Godfrey M f270672a3d added a location check, to prevent notif blowing up 2024-01-23 13:05:39 -08:00
Godfrey M 7c529df49b adds consumable checkout ms notification 2024-01-23 11:21:20 -08:00
Godfrey M e969f8808c adds licenses ms notifications 2024-01-23 11:10:04 -08:00
Godfrey M 5a46ef5d5b adds Accessory Check in out Notifcations, 2024-01-22 15:30:15 -08:00
Godfrey M f049cf5b06 adds Asset Check Out Notification 2024-01-22 10:57:22 -08:00
Godfrey M befab608f2 cha cha cha changes 2024-01-17 17:59:20 -08:00
Godfrey M cdcd868162 formats check in message for MS Teams 2024-01-17 17:31:23 -08:00
Godfrey M ce02e43ab2 fixed integration link, added some conditionals 2024-01-17 16:30:27 -08:00
Godfrey M 9f2af40ef2 adds MS teams integration test 2024-01-17 13:41:45 -08:00
Godfrey M 93ef8317e8 added payload, new MS webhook test method 2024-01-17 11:49:31 -08:00
Marcus Moore 8aa5cf530b
Improve radio button values in custom report form 2024-01-16 12:33:16 -08:00
Godfrey M 74dc17b4b9 adds translations for Label example 2024-01-16 10:47:45 -08:00
snipe adba2d5b6c Remove 7 day padding for expected assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-15 16:11:31 +00:00
snipe 66c24e152f
Merge pull request #14114 from uberbrady/preserve_sort_in_label_generation 
Fixed [FD-39640]: preserve sort order when generating asset labels
 2024-01-11 21:46:01 +00:00
snipe b94aaad9b5 Search on supplier name attached to maintenance 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-10 13:16:07 +00:00
Marcus Moore 423b636db9
Guard against non-integers being passed for company_id 2024-01-09 10:57:43 -08:00
Brady Wetherington 4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
snipe 8541a342cb
Merge pull request #14108 from Godmartinz/asset_maintenance_scope 
Added supplier name as a searchable relation on the asset maintenance report
 2024-01-08 22:25:55 +00:00
Godfrey M 4184b271f7 adds Supplier as a searchable relation on the asset maintenance report 2024-01-08 14:22:35 -08:00
snipe 2707c399ea Check that the asset exists before trying to get properties 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-08 12:42:05 +00:00
snipe f8a21bdb2d Moved limit and offset to after additional qualifiers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 11:59:31 +00:00
Godfrey M 43737263d4 removed that clause 2024-01-04 14:32:03 -08:00
Godfrey M 07eeaea3bf adds an additional clause 2024-01-04 14:30:59 -08:00
Godfrey M 249ff868e5 removes empty seats when sorting by department 2024-01-04 14:26:07 -08:00
Marcus Moore 742e183b02
Add guard against adding null values to query 
Since $request->filled(null) returns true
 2024-01-04 14:04:00 -08:00
spencerrlongg 901b1b83d0 rm code, was probably fixed through rules at some point 2024-01-02 18:27:17 -06:00
Spencer Long 8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
snipe 8bc5f08da5 Fixed a few more small localization issues 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 20:14:49 +00:00
snipe 38bd530fae Update en defaults for controllers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 19:44:20 +00:00
snipe ed9473c8ff Update ResetSettings command to en-US vs en 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 18:32:21 +00:00
snipe 97ba023152 Moved return 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:47:06 +00:00
snipe a5947b8109 Added warning in middleware 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:34:45 +00:00
snipe 4a0d4f5862 Moved static var up above 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:27:11 +00:00
snipe 1a0e1b5f6c Added default to helper per @marcusmoore 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 20:23:11 +00:00
Brady Wetherington 12ed8800d1 Changed some spacing and added a comment as per Snipe 2023-12-19 20:06:48 +00:00
Brady Wetherington 82dd601661 Added back-migration for Big Locale Refactoring 2023-12-19 19:54:04 +00:00
snipe db138479aa Updated locale middleware for mapping 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:43:22 +00:00
snipe 081bd69d5a Added helper method to map values 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 17:43:05 +00:00
snipe 2226bd2cd7 Implement 1D barcode for label "Tapes\Dymo\LabelWriter_30252" #13987 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-19 14:03:55 +00:00