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

12689 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 3412b4dc5a Merge remote-tracking branch 'origin/develop' 2024-02-08 14:58:24 +00: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 f0139c5e41 Merge remote-tracking branch 'origin/develop' 2024-02-06 18:25:19 +00: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 a49e66c689 Merge remote-tracking branch 'origin/develop' 2024-02-06 16:42:16 +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 b25612bbac Merge remote-tracking branch 'origin/develop' 2024-02-06 09:09:39 +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 e763693829 Merge remote-tracking branch 'origin/develop' 2024-02-05 20:51:37 +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 c0fbf106ed Merge remote-tracking branch 'origin/develop' 2024-02-05 19:13:17 +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 383e3829e5 Merge remote-tracking branch 'origin/develop' 2024-02-05 19:04:40 +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 deca842eb0 Merge remote-tracking branch 'origin/develop' 2024-02-05 18:35:56 +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 25f1445afc Merge branch 'master' of https://github.com/snipe/snipe-it 2024-02-05 17:26:54 +00:00
snipe 0042359e5f Prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 17:23:30 +00:00
snipe cf2e2bfbc1 Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-05 17:23:21 +00:00
snipe 60f9a8be9a Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-02-05 17:22:58 +00:00
snipe 8316db9702
Merge pull request #13805 from gitgrimbo/more_line_based_markdown 
Use parseEscapedMarkedownInline for more views
 2024-02-05 17:19:41 +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 58a9c27342 Merge remote-tracking branch 'origin/develop' 2024-02-05 16:31:32 +00:00