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

12760 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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 2d48d96b3c Merge remote-tracking branch 'origin/develop' 2024-02-05 16:10:54 +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
Ivan Nieto Vivanco 5e4a3379a9 Adds Components and Licenses logs to Assets history view 2024-02-01 01:35:25 -06:00
Godfrey M 9dc428b720 ran composer update on the package since the version was explicitized 2024-01-31 17:30:56 -08: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
Marcus Moore 3f76d65b95
Improve test method name 2024-01-30 12:43:07 -08:00
Godfrey M 87bce0c097 adds google notifs for asset check in and out 2024-01-30 12:38:17 -08:00
Marcus Moore 6d41c8cf67
Merge branch 'develop' into bug/sc-24685 2024-01-30 11:44:36 -08:00
Godfrey M 22385a8e35 fix for general webhook not notifiying anymore 2024-01-30 10:47:18 -08:00
snipe 77fa213ccd
Merge pull request #14181 from marcusmoore/bug/sc-24671 
Fixed accessory checkout via API not sending notification and not adhering to qty limit
 2024-01-30 14:24:42 +00:00
spencerrlongg d0a82adc3f changed condition 2024-01-29 20:44:26 -06:00
Marcus Moore de2aa903c5
Scaffold tests 2024-01-29 17:56:55 -08: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