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
snipe
34f1ea1c0e
Re-order gating and refactor group syncing
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-21 10:00:49 +01:00
snipe
e3561ad38e
Added tests
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-21 09:56:57 +01:00
snipe
a7ccf0efff
Added translation
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-21 09:56:51 +01:00
snipe
f422c2ecad
Merge pull request #14741 from Godmartinz/footer-issue
...
removed extra div tags
2024-05-20 20:44:27 +01:00
Godfrey M
db9c435ae0
removed extra div tags
2024-05-20 10:48:57 -07:00
snipe
cc0f2d7074
Merge remote-tracking branch 'origin/develop'
2024-05-20 11:22:34 +01:00
snipe
a820f248c8
Merge pull request #14736 from snipe/fixes/small_translation_additions
...
Fixes/small translation additions
2024-05-20 11:21:47 +01:00
snipe
6a6272ace3
Translate no records found message
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-20 11:19:47 +01:00
snipe
bcb747f886
Added string
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-20 11:19:37 +01:00
snipe
771c85e347
Translated account save message
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-20 11:19:31 +01:00
snipe
e5c358a1fe
Merge pull request #14731 from snipe/features/csp_env
...
Fixed #14664 - allow additional urls in env for CSP
2024-05-16 22:25:11 +01:00
snipe
52c906f6b8
Added to env.example
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 22:21:52 +01:00
snipe
ca1555d962
Fixed #14664 - allow additional urls in env for CSP
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 22:19:18 +01:00
snipe
0d4f13219b
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2024-05-16 22:00:07 +01:00
snipe
7fdbbc846e
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 21:59:38 +01:00
snipe
dbbbb103a0
Merge pull request #14730 from snipe/localizations/updated_strings
...
Updated translations
2024-05-16 21:58:24 +01:00
snipe
2182ea1ce8
Updated translations
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 21:57:19 +01:00
snipe
f2cc9ec1dd
Merge remote-tracking branch 'origin/develop'
2024-05-16 19:57:46 +01:00
snipe
54b24434e1
Set file name variable
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 19:56:58 +01:00
snipe
653ad562a4
Updated codacy link
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 18:56:44 +01:00
snipe
7743b03129
Merge remote-tracking branch 'origin/develop'
2024-05-16 18:51:27 +01:00
snipe
84a601f364
Merge pull request #14729 from snipe/fixes/attribute_for_purchase_date
...
Sets purchase date as date (versus datetime) in labels
2024-05-16 18:49:49 +01:00
snipe
88d131666c
Sets purchase date as date (versus datetime) in labels
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 18:40:49 +01:00
snipe
d691f3b315
Merge remote-tracking branch 'origin/develop'
2024-05-16 16:37:47 +01:00
snipe
00a9d5f33e
Merge pull request #14719 from snipe/fixes/add_next_audit_date_to_assets_form
...
Added next audit date to assets form
2024-05-16 16:33:49 +01:00
snipe
eb0fd2f519
Removed stricter validation :(
...
Signed-off-by: snipe <snipe@snipe.net>
2024-05-16 16:29:11 +01:00
