DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12600 commits 101 branches 268 tags 320 MiB
Commit graph

12600 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 55b3050ca8 Re-applied previous withTrashed PR 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:37:18 +00:00
snipe 2c996a8508
Merge pull request #14241 from snipe/revert-14240-feature/sc-24786 
Revert "Fixed barcodes crashing if asset was deleted"
 2024-02-09 20:36:02 +00:00
snipe 84f8eee869
Revert "Fixed barcodes crashing if asset was deleted" 2024-02-09 20:35:45 +00:00
snipe 590c19dbd7
Merge pull request #14240 from snipe/feature/sc-24786 
Feature/sc 24786
 2024-02-09 20:28:31 +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
snipe ca62481083 Added button and route 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-09 20:23:13 +00:00
snipe f4fc845375 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-08 23:06:47 +00:00
snipe a7af987322
Merge pull request #14229 from Godmartinz/select2-target-fix 
Fixed select inputs un-select2-ifying on mobile
 2024-02-08 23:04:55 +00:00
Godfrey M c4eaae923a removed vue comments since they do not apply anymore 2024-02-08 15:02:47 -08:00
snipe 849ba02516
Merge pull request #14187 from Godmartinz/general-hook_fix 
Fixed the general webhook not notifying anymore
 2024-02-08 23:01:36 +00:00
Godfrey Martinez 9dcd14a712
Merge branch 'develop' into general-hook_fix 2024-02-08 14:59:25 -08:00
snipe a3b96aff1f
Merge pull request #14233 from uberbrady/prevent_svg_injection_with_fake_extensions_rebased 
Fixes file upload XSS vulnerability [sc-24156]
 2024-02-08 14:56:59 +00:00
Brady Wetherington 9bb191f29f Fixes file upload XSS vulnerability [sc-24156] 2024-02-08 14:30:40 +00:00
snipe 4a43ccfa92
Merge pull request #14228 from akemidx/bug/sc-23516 
Fixed: 404 Error on Importer When Uploading a .csv Under Certain Circumstance
 2024-02-08 13:43:07 +00:00
Godfrey M b73e8642d3 removed unnecessary changes 2024-02-06 13:06:21 -08:00
Godfrey M cfe2277a64 forgot to remove comment line 2024-02-06 13:05:04 -08:00
akemidx e776c2cffa formatting the button tag 2024-02-06 15:51:04 -05:00
Godfrey M ca59bc3c9c removes if statement that prevents select2-ifying inputs 2024-02-06 12:46:17 -08:00
akemidx 575362f4dc adding in line to null out the active file on click of button 2024-02-06 15:38:07 -05:00
snipe 5f8ac66036
Merge pull request #14223 from Godmartinz/user-bulk-edit 
Fixed Select2 functionality in User bulk check-in Delete User
 2024-02-06 18:22:46 +00:00
snipe 1630e4bc2f
Merge pull request #14227 from snipe/fixes/bulk_update_by_audit_interval 
Switch to bulk updating to handle audit interval updates
 2024-02-06 16:06:08 +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
Godfrey M 5aa34695a1 z 2024-02-05 16:41:29 -08: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
snipe e08d60ed18
Merge pull request #14221 from snipe/bug/sc-24749 
Chunk data to reduce memory on large datasets when updating `next_audit_date`
 2024-02-05 20:50:41 +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
Marcus Moore 76cc5995d9
Write tests around getIdForCurrentUser method [sc-24748] 2024-02-05 12:38:33 -08:00
snipe 7b4020c5e9 Updated string paths for URL 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 19:09:16 +00:00
snipe 91356af838
Merge pull request #14220 from snipe/bug/sc-24740 
Removed loading of assets for label count
 2024-02-05 19:02:10 +00:00
snipe 4c967a43a7 Removed loading of assets for label count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:56:51 +00:00
snipe 44366746dd
Merge pull request #14219 from snipe/fixes/resurface_load_remote 
Fixed #14185 - Resurfaced `load_remote` in admin
 2024-02-05 18:33:11 +00:00
snipe 3806cec10e Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:28:05 +00:00
snipe a800fa07f9 Removed duplicate string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 18:27:58 +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 ebc373744a
Merge pull request #14218 from snipe/security/alpine_3_18_6 
Security upgrade alpine from 3.18.5 to 3.18.6 #14178
 2024-02-05 17:16:18 +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 212dd06948 Security upgrade alpine from 3.18.5 to 3.18.6 #14178 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 17:07:31 +00:00
snipe b6eea2e170
Merge pull request #14217 from snipe/security/snyk_bs_table_14199 
Upgrade bootstrap-table from 1.22.1 to 1.22.2 #14199
 2024-02-05 16:59:51 +00:00
snipe 688017bd8a Upgrade bootstrap-table from 1.22.1 to 1.22.2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 16:59:01 +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 abd13a1140
Merge pull request #14216 from snipe/bug/sc-24727 
Fixed company asset counts for dashboard widget
 2024-02-05 16:07:40 +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 dc92bbf61e
Merge pull request #14215 from snipe/bug/sc-24726 
Removed initial check for assets, licenses, etc
 2024-02-05 15:54:45 +00:00
snipe e6fdeb0e8a Removed initial check for assets, licenses, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 15:30:18 +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