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

14285 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore fa6e170feb
Install passport 2024-05-23 14:01:06 -07:00
Marcus Moore 51f72daba1
Debugging step 2024-05-23 13:55:03 -07:00
Marcus Moore a130033480
Revert "Add Install Passport step" 
This reverts commit ef95ede833.
 2024-05-23 12:45:38 -07:00
Marcus Moore ef95ede833
Add Install Passport step 2024-05-23 12:32:34 -07:00
Marcus Moore d06e5f25b0
Remove old trait from test 2024-05-23 11:51:08 -07:00
U-H-T 2777ac96cc add logo support for Brother TZe24mm labels 2024-05-23 11:10:23 +02:00
snipe fd42f1ef24 Merge remote-tracking branch 'origin/develop' 2024-05-23 08:39:31 +01:00
snipe 8b3ff5a82d Handle potentially deleted admin users in license export 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-23 08:39:15 +01:00
Marcus Moore 482ebfbb68
Implement test 2024-05-22 17:21:29 -07:00
Marcus Moore 67c4fa2966
Improve event assertions 2024-05-22 17:14:10 -07:00
Marcus Moore a3389a31cd
Update test name and add todo 2024-05-22 17:10:16 -07:00
Marcus Moore 8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-05-22 16:09:27 -07:00
Marcus Moore 6d104251b3
Remove todo 2024-05-22 15:40:54 -07:00
Marcus Moore f16c79bb9a
Improve event assertions 2024-05-22 15:38:23 -07:00
Marcus Moore 1fe22e4b7b
Re-order scenarios 2024-05-22 13:33:41 -07:00
Marcus Moore c7fa2c04ad
Add scenario 2024-05-22 13:33:12 -07:00
Marcus Moore 8ca882d1c8
Complete a scenario 2024-05-22 13:23:49 -07:00
Marcus Moore 5d368990dc
Fix assertion 2024-05-22 13:15:51 -07:00
Brady Wetherington 4adbd7af4c Merge branch 'develop' into snipeit_v7_laravel10 2024-05-22 21:02:11 +01:00
Marcus Moore 1935a4aca3
Improve scenario naming 2024-05-22 12:47:33 -07:00
Godfrey M c4d96f6ea3 removed extra div 2024-05-22 12:35:32 -07:00
snipe 986d5641f6 Merge remote-tracking branch 'origin/develop' 2024-05-22 18:39:25 +01:00
snipe e163d5cfc7
Merge pull request #14753 from snipe/chore/sc-24895/add_exif_to_upgrade_php_file 
Added exif to required extensions
 2024-05-22 18:31:47 +01:00
snipe b1e7c772ae Added exif to required extensions 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 18:27:52 +01:00
snipe dce1854ac4 Merge remote-tracking branch 'origin/develop' 2024-05-22 18:04:53 +01:00
snipe c4b4923ff8 Add @LeePorte as a contributor 2024-05-22 18:04:24 +01:00
snipe c20d10d4f2 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-05-22 17:50:14 +01:00
snipe b0479d543d Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-05-22 17:49:33 +01:00
snipe 81704c1d40 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:49:29 +01:00
snipe d3798bf251
Merge pull request #14752 from snipe/fixes/better_handle_data_file_mismatch_in_user_files 
Nicer handling of erroring when filename+log do not match
 2024-05-22 17:47:39 +01:00
snipe 4bb7c1701f Fiddled with storage facade a little more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:44:49 +01:00
snipe 5fd0f56258 Use proper storage facade for checking if the file exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:38:49 +01:00
snipe 37d7e89e93 Fixed error message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:29:43 +01:00
snipe 3ab197075a Nicer handling of erroring when filename+log do not match 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:20:03 +01:00
Brady Wetherington 12e8ac8b41
Merge pull request #14751 from uberbrady/docker-permissions-fix-rebased 
Fixed #12299: permissions on storage dir in Docker (rebased)
 2024-05-22 16:57:35 +01:00
Lee Porte 6783dc1312 Fixed #12299: permissions on storage dir in Docker 
Fixes #12299, where currently there is no recursive permissions set on
/var/www/html/storage/ during build time. As a result this requires
users to run an exec into the container and change the permissions
before they are able to initiate the setup. Without this a 500 error is
thrown and little is evident in the docker logs as to what the issue
is.
 2024-05-22 16:54:07 +01:00
snipe b489c71fa2 Removed generated file 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 13:09:02 +01:00
snipe cf5f6f9b13 Created by OWASP Threat Dragon 2024-05-22 13:06:32 +01:00
snipe 860432acc5 Merge remote-tracking branch 'origin/develop' 2024-05-22 12:45:26 +01:00
snipe c9f7847fb3
Merge pull request #14745 from snipe/fixes/self_api_endpoint 
Refactor group syncing on user edit API endpoint
 2024-05-22 12:43:22 +01:00
snipe 6fad085a7d Removed debug in test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 12:37:49 +01:00
snipe 4b23ef4021 Added new test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 12:35:03 +01:00
snipe bb96a190fd Moved validator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 12:34:48 +01:00
snipe e1eb457f3d
Update tests/Feature/Api/Users/UpdateUserApiTest.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2024-05-22 11:03:46 +01:00
snipe 51025aad57
Update tests/Feature/Api/Users/UpdateUserApiTest.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2024-05-22 11:03:38 +01:00
snipe 14c4765be2
Update tests/Feature/Api/Users/UpdateUserApiTest.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2024-05-22 11:00:52 +01:00
snipe 3afe996755
Update tests/Feature/Api/Users/UpdateUserApiTest.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2024-05-22 11:00:47 +01:00
snipe 0891bd747a
Update tests/Feature/Api/Users/UpdateUserApiTest.php 
Co-authored-by: Marcus Moore <contact@marcusmoore.io>
 2024-05-22 11:00:31 +01:00
Godfrey M f2693ee957 conditionally fixed redirect select option 2024-05-21 14:08:35 -07:00
Godfrey M 0327e71f0f made message the keys, cleaned up array 2024-05-21 13:26:29 -07:00