DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 23:19:42 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
12509 commits 102 branches 268 tags 288 MiB
Commit graph

12509 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 1a48790dfe
Merge pull request #14116 from marcusmoore/bug/sc-24475 
Guard against passing non-integer for company_id when creating asset
 2024-01-09 19:08:14 +00:00
Marcus Moore 423b636db9
Guard against non-integers being passed for company_id 2024-01-09 10:57:43 -08:00
snipe be32152394 Merge remote-tracking branch 'origin/develop' 2024-01-09 17:44:19 +00:00
snipe 824c3e6ecf
Merge pull request #14087 from ubc-cpsc/bugfix/CVE-2023-51651 
Fixes CVE-2023-51651 Potential URI resolution path traversal in the AWS SDK for PHP
 2024-01-09 17:44:04 +00:00
snipe 4053b75f49 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-01-09 17:43:11 +00:00
snipe ea4a0c2293 docs: add @mauro-miatello as a contributor 2024-01-09 17:43:03 +00:00
snipe 10ee6ee5c4
Merge pull request #14115 from mauro-miatello/develop 
Added license expiration date in "view asset"
 2024-01-09 17:38:51 +00:00
MrM 9d16eacad5
Added license expiration date in "view asset" 
I've added the expiration date of the license associated with an asset in hardware/ID#software, it is useful to see all of them on the asset page instead of having to open the license details page. I've also fixed a space formatting issue.
 2024-01-09 18:30:51 +01:00
Brady Wetherington 4b90f85372 Fixed [FD-39640]: preserve sort order when generating asset labels 2024-01-09 16:37:33 +00:00
snipe 8001ed8436 Merge remote-tracking branch 'origin/develop' 2024-01-08 22:30:05 +00:00
snipe eaf6d56253
Merge pull request #14109 from marcusmoore/chore/sc-24397 
Moved contributors to dedicated file
 2024-01-08 22:28:52 +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
Marcus Moore 6b105ba8f0
Move link 2024-01-08 14:17:42 -08:00
Marcus Moore 348ed1e555
Add link to contributors file 2024-01-08 14:16:15 -08:00
Marcus Moore 8314047bfb
Add newline to start of contributors file 2024-01-08 14:02:09 -08:00
Marcus Moore 1bd4b3827d
Add missing comma 2024-01-08 13:47:43 -08:00
Marcus Moore a2463c2a71
Reference correct file 2024-01-08 13:43:26 -08:00
Marcus Moore f4d568bf89
Add missing config key 2024-01-08 13:40:57 -08:00
Marcus Moore eb862c27b8
Add config keys 2024-01-08 13:31:30 -08:00
Marcus Moore 18f79ad924
Move contributors from readme to dedicated files 2024-01-08 13:29:18 -08:00
Marcus Moore afb396ed65
Add contributor commands to package.json 2024-01-08 13:26:58 -08:00
Marcus Moore 8ea15fc6aa
Run generate command to migrate to new style 
(from markdown style tables and images to html style)

./node_modules/.bin/all-contributors generate
 2024-01-08 12:42:45 -08:00
Marcus Moore 064ec1c22d
Add missing markers 2024-01-08 12:39:40 -08:00
Marcus Moore 2f47217003
Add all-contributors-cli as dev dependency 2024-01-08 12:26:52 -08:00
snipe d71a04e489 Merge remote-tracking branch 'origin/develop' 2024-01-08 17:24:47 +00:00
snipe 4f8defb67d
Merge pull request #14107 from snipe/bug/sc-24471 
Check that the asset exists before trying to get properties
 2024-01-08 12:43:13 +00: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 012fe57ca1 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 15:16:14 +00:00
snipe f5960388f1 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2024-01-05 15:05:22 +00:00
snipe 6ebbd2dc30
Merge pull request #14104 from snipe/feature/google_login_more_prominent 
Move Google Login prompt higher, made it bigger
 2024-01-05 15:03:12 +00:00
snipe 7c5d29ccd9 Move Google Login prompt higher, made it bigger 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 14:56:34 +00:00
snipe 93712ec417
Merge pull request #14103 from snipe/bug/user_api_limit_offset_order 
Moved limit and offset in user API to after additional qualifiers
 2024-01-05 12:02:18 +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
snipe 10ef47fe87 Merge remote-tracking branch 'origin/develop' 2024-01-04 23:37:36 +00:00
snipe 98ef687e9c
Merge pull request #14090 from marcusmoore/chore/sc-24386 
Run sqlite tests in GitHub action
 2024-01-04 22:41:37 +00:00
snipe 432f05586e
Merge pull request #14100 from Godmartinz/fix-license-seat-department-link 
fixed `departmentNameLinkFormatter` url
 2024-01-04 22:40:24 +00:00
snipe dbcf7e3fd1
Merge pull request #14101 from marcusmoore/bug/sc-24398 
Fixes creating invalid query with null values
 2024-01-04 22:36:46 +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
Godfrey M a110b5fcca ugh 2024-01-04 12:37:53 -08:00
Godfrey M 1f1e58eb1e remove unintentional change 2024-01-04 12:36:57 -08:00
Godfrey M 32b34ca9b9 departmentNameLinkFormatter had a bad url 2024-01-04 12:33:33 -08:00
snipe 3a6d626aa1 Merge remote-tracking branch 'origin/develop' 2024-01-04 00:36:50 +00:00
snipe 0c6611d6bd
Merge pull request #14097 from spencerrlongg/hotfix/migration_model_issue 
Use Query Builder instead of Model for Update to Skip Observer
 2024-01-04 00:36:30 +00:00
spencerrlongg 0d853f931d use query builder instead of model for update to skip observer 2024-01-03 18:32:13 -06:00
snipe c8816354ae Updated assets for master 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:28:54 +00:00
snipe 42d35174b2 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:25:56 +00:00