lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
12602 commits 1 branch 0 tags 220 MiB
Commit graph

4966 commits

Author SHA1 Message Date
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
Godfrey M
5cbcac28b1 adds custom fields as an example in label settings 2024-02-14 16:53:38 -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
snipe
a76a69d085 Fixed incorrect string for location not existing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-13 20:23:32 +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
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
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
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