DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 03:24:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13774 commits 96 branches 267 tags 296 MiB
Commit graph

13774 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brady Wetherington f64b0d3818 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-14 16:00:29 +00:00
snipe ec83b733f1 Merge remote-tracking branch 'origin/develop' 2023-11-14 14:40:21 +00:00
snipe a81e2be6da
Merge pull request #13876 from snipe/fixes/added_fieldmap_back_for_cli_import 
Added default map back to the importer
 2023-11-14 14:40:08 +00:00
snipe 73ebd9017f Added default map back to the importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-14 14:37:48 +00:00
Marcus Moore 1a26ea0911
Update a couple more fields for new validation 2023-11-13 19:18:04 -08:00
Marcus Moore 7098ab6509
Match styling of existing error messages 2023-11-13 18:54:51 -08:00
Marcus Moore 0d3589ca24
Update create asset page to use new validation library 2023-11-13 18:17:39 -08:00
Marcus Moore f02ff62a08
Install jquery-validation package 2023-11-13 18:15:18 -08:00
spencerrlongg fbfc817c5f just some cleanup 2023-11-13 19:47:03 -06:00
snipe a48eb60f87 Merge remote-tracking branch 'origin/develop' 2023-11-13 20:40:05 +00:00
snipe 13601031cb
Merge pull request #13764 from Godmartinz/expiring-alerts-fix 
Fixed the `getExpiringLicenses` query
 2023-11-13 20:39:29 +00:00
snipe 4546e87eb5
Merge pull request #13680 from marcusmoore/feature/sc-23769 
Changed data source input to select in new label engine
 2023-11-13 20:38:42 +00:00
snipe 9dc9834bcb
Merge pull request #13859 from inietov/fixes/attempt_to_read_id_on_boolean 
Fixed ErrorExemption: Attempt to read property "id" on bool [sc-23945]
 2023-11-13 20:22:52 +00:00
snipe 4ecce51b57
Merge pull request #13831 from Godmartinz/multi-sync-ldap-locations 
Added multi location sync for ldap
 2023-11-13 20:20:45 +00:00
snipe 000a28d648
Merge pull request #13830 from spencerrlongg/bug/sc-23921 
Resolves Exceptions When An Array is Submitted and Exception Occurs Before Validation
 2023-11-13 20:19:44 +00:00
snipe f3d6de316b Merge branch 'master' of https://github.com/snipe/snipe-it 2023-11-13 16:41:18 +00:00
snipe 1f17c6e4f4 Merge remote-tracking branch 'origin/develop' 2023-11-13 16:41:07 +00:00
snipe 495df737fc Unfixed indenting :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-13 16:39:35 +00:00
snipe 0bae1a1f5e
Merge pull request #13853 from snipe/features/link_back_to_asset_on_create 
Link back to asset on create
 2023-11-13 16:37:35 +00:00
snipe 442cad69a7
Merge pull request #13864 from marcusmoore/chore/sc-24012 
Fixed GitHub Action tests for v7
 2023-11-13 16:34:35 +00:00
snipe 5dde7cb439
Merge pull request #13871 from snipe/snyk-fix-bdea9ba7648f6c20aef5ce312ee450cd 
[Snyk] Security upgrade alpine from 3.17.3 to 3.17.5
 2023-11-13 16:34:08 +00:00
snyk-bot 6acff575e6
fix: Dockerfile.alpine to reduce vulnerabilities 
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-5438697
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-5788365
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-5821141
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-6032385
- https://snyk.io/vuln/SNYK-ALPINE317-OPENSSL-6032385
 2023-11-13 04:03:04 +00:00
Marcus Moore be6545a366 Merge Laravel setup steps 2023-11-09 15:55:04 -08:00
Marcus Moore 32fdd36802 Run migrations 2023-11-09 15:51:30 -08:00
Marcus Moore fbc54526ed Set variables for Passport install step 2023-11-09 15:47:52 -08:00
Marcus Moore a3306e4a81 Install Passport during test setup process specifying the environment 2023-11-09 15:41:22 -08:00
Marcus Moore 3d858b21fa Revert "Install Passport during test setup process" 
This reverts commit 690a5119f4.
 2023-11-09 15:29:31 -08:00
Marcus Moore 62b557f82c Revert "Add database migration step" 
This reverts commit 65e3696029.
 2023-11-09 15:29:19 -08:00
Marcus Moore 158c82ff5f Revert "Be explicit about database host" 
This reverts commit fd410c0281.
 2023-11-09 15:26:50 -08:00
Marcus Moore fd410c0281 Be explicit about database host 2023-11-09 15:20:41 -08:00
Marcus Moore 65e3696029 Add database migration step 2023-11-09 14:56:32 -08:00
Marcus Moore 690a5119f4 Install Passport during test setup process 2023-11-09 14:49:56 -08:00
Marcus Moore cc0653c68a Update GitHub test action to run on PHP 8.1 and 8.2 2023-11-09 14:42:47 -08:00
Marcus Moore 042a15d294 Set minimum PHP version to 8.1 2023-11-09 14:41:13 -08:00
snipe 9bff2d0bbf Fixed indenting? 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-09 21:47:29 +00:00
snipe 9e1cfac995
Merge pull request #13857 from akemidx/bug/sc-20532 
Bug Fix:  Undefined array key 266
 2023-11-09 09:39:04 +00:00
spencerrlongg 8e4c0f60a1 return format 2023-11-08 17:36:54 -06:00
spencerrlongg 5615fc09e6 add view modal 2023-11-08 16:55:29 -06:00
spencerrlongg d68f1e4cfa initial display work done 2023-11-08 16:48:20 -06:00
spencerrlongg 0c4901487d delete component class (for now) 2023-11-08 16:12:01 -06:00
spencerrlongg 7f4b2d6e42 modal and initial stuff working 2023-11-08 16:10:09 -06:00
Ivan Nieto Vivanco 7d30001ff8 Ignore the importer checkout if user is not found 2023-11-08 15:32:33 -06:00
Marcus Moore 49136a4d67 Add tests for color helper 2023-11-08 12:35:42 -08:00
akemidx 4382adce85 typo in error log message 2023-11-08 15:29:29 -05:00
spencerrlongg 715a49d9fe update php in composer.json 2023-11-08 14:29:06 -06:00
akemidx 2051ac785d adding in error logging and code comments 2023-11-08 13:44:46 -05:00
akemidx 9cc89911f7 possibilitieeeeeeeeessss 2023-11-08 13:29:32 -05:00
akemidx 495521b70e adjusting for less than 0 possibility 2023-11-08 12:51:51 -05:00
snipe 6da0671143 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:44:09 +00:00
snipe a24d21e683 Added new unescaped alert box 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-08 14:41:05 +00:00