DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6902 commits 97 branches 266 tags 291 MiB
Commit graph

6902 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 5f52ee59b2
Merge pull request #9529 from dampfklon/Feature_#9514_Asset_Acceptance,_resend_mail/_send_remainder 
Feature #9514, Feature #9378 Unaccepted Assets Report Actions, Fixed [ch16410]
 2021-10-07 12:49:42 -07:00
Dampfklon ab4a234e20 fix rebase errors 2021-10-07 21:32:57 +02:00
Dampfklon 7645f23f5c remove pending Acceptances on checkin 2021-10-07 21:03:46 +02:00
Dampfklon 4418ad2340 Enable display of deleted acceptances, strike deleted users, add date, enable sorting 2021-10-07 21:03:46 +02:00
Dampfklon 12ee06deb6 add Download All Button, change route analogue to activity report 2021-10-07 21:01:50 +02:00
Dampfklon 9a9ca59544 Fix decprecated implode usage 2021-10-07 20:55:47 +02:00
Dampfklon ed99532c30 Unaccepted Assets Report Actions (send reminder, delete) added 
Unaccepted Assets Export fixed
 2021-10-07 20:53:02 +02:00
snipe ac76364140
Merge pull request #10172 from snipe/fixes/S3_upload_preview 
Fixed models preview - Use Storage:: facade
 2021-10-06 13:14:02 -07:00
snipe 7848a3c3dc Use Storage:: facade for image preview for models 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 13:12:42 -07:00
snipe f41ec640fe Added Huntr.dev badge 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 12:49:30 -07:00
snipe fc5efd857f
Merge pull request #10171 from snipe/fixes/xss_svg_in_file_uploads 
Fixed SVG XSS vuln
 2021-10-06 12:38:51 -07:00
snipe ccd430ce07 Switched back down to debug level 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 12:38:21 -07:00
snipe f306401e7e Fixed SVG XSS vuln 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 12:26:45 -07:00
snipe c06a93ef13 Removed extra brace in assets for components 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-06 10:38:13 -07:00
snipe 17d4e25e60
Merge pull request #10167 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror 
Set headers in a different manner in the middleware [sc-17520]
 2021-10-05 14:06:39 -07:00
Ivan Nieto Vivanco ef6eea67d8 Set headers in a different manner in the middleware 2021-10-05 14:09:35 -05:00
snipe 3980c80c70
Merge pull request #10166 from uberbrady/fix_default_values_for_custom_fields_for_models_rebased 
Fix default values for custom fields for models rebased
 2021-10-04 22:27:45 -07:00
Brady Wetherington bbeedc026d A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working. 2021-10-04 22:07:29 -07:00
Brady Wetherington d80604f2ac Most of the basics are working, but not done and lots of debug messages are about 
I picked up the change that picked a point-release difference on the AWS library since that usually
works out for us (x.y.1 vs. x.y.2 - usually a good call)
 2021-10-04 22:06:48 -07:00
snipe 84c73aae5d
Merge pull request #10165 from snipe/fixes/set_restore_actions_to_POST_requests 
Set restore actions to POST requests instead of GET
 2021-10-04 20:40:33 -07:00
snipe dc3af7cc74 Resolved conflicts 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 20:39:24 -07:00
snipe 34eab88b7e Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 20:25:31 -07:00
snipe 903609b5a5 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:59:55 -07:00
snipe e491a93892 Removed restore link 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:56:56 -07:00
snipe b20c841a89 Fixed asset models restore 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:29:13 -07:00
snipe 8fe59f8383 Switch users restore over to POST 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:22:38 -07:00
snipe 8bf09d9f89 Make form-based restore button on asset view 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 19:01:16 -07:00
snipe 1457fda508
Merge pull request #10159 from AL4AL/specify_docker_images_version 
Fixed #10158 Specify docker images versions
 2021-10-04 18:28:11 -07:00
snipe 3594ec9905 Handle bulk check and uncheck 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 17:58:16 -07:00
snipe 52caee2a9f Handle checking and unchecking for bulk actions 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 17:18:26 -07:00
snipe 52ea172e5d Fix ID array 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 17:18:07 -07:00
snipe caad5be957 Updated routes to use POST for restore 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 17:17:36 -07:00
snipe fa1cf3073b Add @alwism as a contributor 2021-10-04 15:04:58 -07:00
snipe 71badee78a Add @Robert-Azelis as a contributor 2021-10-04 15:04:47 -07:00
snipe cb0d1add8d Add @01ste02 as a contributor 2021-10-04 15:04:22 -07:00
snipe 1b0d11a572 Add @jethron as a contributor 2021-10-04 15:03:50 -07:00
snipe 9e522b6a4d Add @Computroniks as a contributor 2021-10-04 15:03:35 -07:00
snipe a773e70936 Add @Toreg87 as a contributor 2021-10-04 15:03:23 -07:00
snipe 92a38f2a23 Add @jerm as a contributor 2021-10-04 15:03:05 -07:00
snipe 542f774c68 Add @FliegenKLATSCH as a contributor 2021-10-04 15:02:56 -07:00
snipe 67e106c7fa Add @AL4AL as a contributor 2021-10-04 15:02:51 -07:00
snipe 536b5717f0
Merge pull request #10164 from snipe/fixes/require_revalidation_on_logout_back_button 
Force revalidation headers when user logs out
 2021-10-04 12:56:03 -07:00
snipe 9b48732cd2 Force revalidation headers when user logs out 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 12:52:48 -07:00
Sajjad f036e2b2a3 Specify docker images versions 
Fix unquoted sentences
 2021-10-03 11:12:53 +03:30
snipe 244616b31e
Merge pull request #10157 from snipe/jerm/fix-cachedir-ownership 
[Docker] Fix ownership of cache directory in startup script
 2021-10-01 17:50:36 -07:00
Jeremy Price 22313711d5 Fix ownership of cache directory 
Snipe-IT was waiting to load because
/var/www/html/storage/framework/cache/ and its contet were owned by
root:root, but docker needed to be able to write to them

This change recursively chowns that path to docker:root, and now it
loads.
 2021-10-01 16:54:17 -07:00
snipe 89e650f842 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-30 16:01:56 -07:00
snipe daa88f06f7 Added pivot to components JSON 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-30 15:51:08 -07:00
snipe d0acb9fdb4 Applies PR #10150 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-30 15:33:00 -07:00
snipe b919f5b1e9
Merge pull request #10150 from inietov/fixes/new_department_error_importing_users 
Fixes New department error importing users.
 2021-09-30 15:31:17 -07:00