DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 06:29:47 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
14572 commits 101 branches 268 tags 288 MiB
Commit graph

3000 commits

Author SHA1 Message Date
snipe a1eafc108d Moar typehinting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 22:37:58 +01:00
snipe ef56f599d2 Use asset model request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 21:52:29 +01:00
snipe c570759370 Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 21:14:58 +01:00
snipe cc6f1cd585 Added asset model request :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:50:11 +01:00
snipe ae9085b11f Modernize use statements, switch to auth() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:49:22 +01:00
snipe e98284fff5 Modernized helpers and use statements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 20:48:35 +01:00
snipe 3f20e29901 Moved gthe settings for remote loading to the branding section 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 16:55:47 +01:00
snipe 2f3be267b3 Added some logic around deleting images 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 16:33:22 +01:00
snipe 9fe26ba814 Reverted the validation - might have an impact on quickstart setup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:25:39 +01:00
snipe e372527d13 Added default_avatar to settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:22:36 +01:00
snipe a6d04509a5
Merge pull request #15016 from snipe/improved_user_merge 
Fixed #15005 - Improvements  on user merge
 2024-07-03 23:19:50 +01:00
snipe 59f66051f8 More eager loading 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:18:37 +01:00
snipe f22c3cdda9
Merge pull request #15021 from snipe/fixes/removed_non_counts 
Removed non-counts from allowed array
 2024-07-03 22:21:17 +01:00
akemidx ca57f6de85 adding in item=>asset, missed in first commit 2024-07-03 17:07:50 -04:00
snipe aefaabdb1a Removed non-counts from allowed array 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 21:40:43 +01:00
snipe 574867536d Standardize query for merging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 19:41:34 +01:00
snipe a25263f868 Transfer files and acceptances on merge 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:29:49 +01:00
spencerrlongg 6f29c0a7cf Merge branch 'refs/heads/develop' into bug/sc-24884 
# Conflicts:
#	routes/api.php
 2024-07-02 15:48:39 -05:00
snipe 55c98cc27a Check that the user exists before trying to fill the request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 14:05:28 +01:00
snipe 1c14c2fdef Added gates to controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:05:21 +01:00
snipe 73a038afd4 Save new setting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:03:01 +01:00
snipe 294fb1f774
Merge pull request #14925 from snipe/fixes/added_2fa_string 
Additional translation strings
 2024-06-24 12:11:45 +01:00
snipe 468674a517 Check that there is a depreciation date before formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 11:07:41 +01:00
snipe 7ec44e46ce Added ability check for restoring users at all 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:35:28 +01:00
snipe c2e649e2bf Fixed small permissions issue 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:07:37 +01:00
snipe e60dbc883c Removed test code 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:42:34 +01:00
snipe 9e59bd5687 Cleaned up controller code a bit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:33:36 +01:00
snipe 1d26ccac4e Check for the additional auth for that user 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:33:06 +01:00
snipe dd9e9c7a6d Fixed return types 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 18:49:49 +01:00
snipe e19922abd0 Cleaned up UI controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 18:49:35 +01:00
snipe e03614d91b Added withtrashed back in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 16:40:32 +01:00
snipe b82770d0a8 One more small fix 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 16:38:29 +01:00
snipe 55e1326164 Fixed #14935 - user does not exist 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 16:24:18 +01:00
snipe 9a0db72eb4 More strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:40:38 +01:00
snipe e11a42cf68 Re-use login string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:32:00 +01:00
snipe 9594596b8a Fixed another hard-coded string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:22:27 +01:00
snipe 30c1e1e86a Merge remote-tracking branch 'origin/develop' 2024-06-20 14:32:46 +01:00
snipe 8f8a5c639b Updated profile translation string path 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:09:25 +01:00
snipe c8835bf5db Merge remote-tracking branch 'origin/develop' 2024-06-20 13:40:37 +01:00
bryanlopezinc 203b60383f Added storage path permissions test for SettingsController@getSetupIndex 2024-06-19 17:46:59 +01:00
snipe dc7b9315b5 Merge remote-tracking branch 'origin/develop' 2024-06-19 10:35:54 +01:00
snipe 6c17b141db Removed duplicate locations_id search 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 10:35:21 +01:00
snipe d0299de898 Merge remote-tracking branch 'origin/develop' 2024-06-18 11:25:55 +01:00
snipe 941582ac2a Properly scope archived based on settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 10:27:11 +01:00
snipe 05b97db747 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-06-18 09:32:30 +01:00
Marcus Moore 796d6909d5
Add missing } 2024-06-17 14:40:06 -07:00
snipe 233e4af7f8 Added base asset models test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 11:57:30 +01:00
snipe dc1b808a28 Fixed static request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 11:47:21 +01:00
snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-06-17 11:18:33 +01:00
snipe 756a2ac25c Added API tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-12 11:58:12 +01:00
snipe 7e3d66ec53
Merge branch 'develop' into fixes/companyable_trait_on_users 2024-06-12 11:27:26 +01:00
snipe 1ca9bb5aa8
Merge pull request #14698 from Scarzy/features/asset_file_upload_from_api 
Added #9413: Asset file upload from API
 2024-06-12 11:18:06 +01:00
snipe c641b733e1
Merge pull request #14834 from bryanlopezinc/AddAppUrlTest 
Added test for app url config
 2024-06-12 11:14:17 +01:00
Brady Wetherington c8820adb56 Add two new 'with()' relationships to Users API index query 2024-06-10 13:29:53 +01:00
bryanlopezinc d35e251d6e Added test for app url config 2024-06-05 21:46:43 +01:00
snipe 5cdb2b7163 Check that the user was not aready deleted 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 14:00:35 +01:00
snipe d4c080c7e4 Use the form request on the UI controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 13:40:32 +01:00
snipe 065a47a446 Use the DeleteUser request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 13:28:44 +01:00
snipe de7b8940fe
Merge pull request #14828 from fe80/fix/controller-signature-s3 
fix(ActionlogController): add missin class Illuminate\Support\Facades…
 2024-06-05 09:58:03 +01:00
snipe 09e94ec176 Reordered withTrashed() and find() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 09:57:24 +01:00
fe80 ea7c3c8485
fix(ActionlogController): add missing class Illuminate\Support\Facades\Storage 2024-06-05 10:55:27 +02:00
snipe bc36c8074e
Merge pull request #14807 from bryanlopezinc/AddTestToCheckEnvVisibility 
Added test for .env visibility for setup page
 2024-06-05 09:50:54 +01:00
snipe a742105c21
Merge pull request #14827 from fe80/fix/controller-signature-s3 
fix(ActionlogController): correct signature image for s3 bucket
 2024-06-05 09:40:21 +01:00
fe80 7a76ec9e02
fix(ActionlogController): correct signature image for s3 bucket 2024-06-05 10:08:15 +02:00
snipe 877adb082c Fixed translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-03 16:40:52 +01:00
snipe 67fb3f10d5 Tightened up tests with better checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 04:24:47 +01:00
snipe cff382605c Fixed some missing strings and checks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 04:01:04 +01:00
snipe 03b0268dc2 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-01 03:00:45 +01:00
snipe 3f9a80942e Removed manual companyable from non-API views 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 23:10:23 +01:00
snipe dc62e393c3 Hotfix for user permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 21:22:21 +01:00
snipe a15ed6eaee Wrap disabled <a> links in a span for tooltips 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 19:29:29 +01:00
snipe cf45e7536f Redirect with error if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:51:58 +01:00
snipe ca8d478e87 Redirect if model is invalid 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 18:46:32 +01:00
bryanlopezinc c63c17d49f Added test for .env visibility for setup page 2024-05-31 17:33:57 +01:00
snipe 801e58d52e Removed manual scoping 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:58:15 +01:00
snipe aadee068b3
Merge pull request #14740 from Godmartinz/redirect_back_to_asset 
Added Redirect options to asset check in/out
 2024-05-30 14:14:04 +01:00
snipe a46e2ebfd8 Small tweaks to user export, user view translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 13:59:00 +01:00
snipe f710b1aac3
Merge pull request #14614 from akemidx/feature/sc-19796 
ADDED: Export User Permissions (Superuser & Admin)
 2024-05-30 13:41:26 +01:00
snipe f6fe6e70b9
Merge branch 'develop' into redirect_back_to_asset 2024-05-30 13:38:11 +01:00
Scarzy f48c5ee252 Fix an error message 2024-05-29 22:32:45 +01:00
Scarzy 98a94dec29 Change some errors to be 404 
The asset or file was not found, so 500 wasn't the best choice of error
code
 2024-05-29 22:17:36 +01:00
Scarzy 45329912e6 Give a better response to listing no files on an asset 
HTTP500 was never a good choice. Now it sends back an empty array
 2024-05-29 22:01:49 +01:00
Scarzy bb0a614c39 Update some comments 2024-05-29 22:01:48 +01:00
Scarzy f11ea79406 Add some sanity checks that the asset actually exists 2024-05-29 22:01:48 +01:00
Scarzy e817b20840 Fix some responses to be more appropriate 
Error/success was mixed up
 2024-05-29 22:01:48 +01:00
Scarzy 516f766a44 Remove some debug code 2024-05-29 22:01:48 +01:00
Scarzy f5791c79a5 Change the returns to be API appropriate 2024-05-29 22:01:48 +01:00
Scarzy 194853d860 Remove a redundant line 2024-05-29 22:01:48 +01:00
Scarzy 92670d5711 Add the ability to list files for an asset 2024-05-29 22:01:48 +01:00
Scarzy 8a2ea971e1 Add an API assets files controller 
Based heavily on the Assets assets files controller.
Added errors related to to the files management.
Added the API endpoints for file upload and show, but only upload is
currently tested/works.
 2024-05-29 22:01:48 +01:00
snipe 12e107a71b
Merge pull request #13062 from ak-piracha/feature/snipe-12892-bulk-consumable-checkout 
Bulk Consumable Checkout
 2024-05-29 19:42:25 +01:00
snipe df1cef59d5 Fixes path for redirect response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 18:01:40 +01:00
snipe 92ba889cae Updated/removed facades 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:53:51 +01:00
snipe f17162c2e2 Use artisan facade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:40:05 +01:00
snipe fb233c0aa4 Cleaned up facade names and references 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:38:15 +01:00
bryanlopezinc 5d01a06245 Reduce IDE errors in App\Http\Controllers\SettingsController 2024-05-29 08:07:49 +01:00
Marcus Moore 4c78da3bbf
Re-add json encoding of permissions 2024-05-28 13:03:09 -07:00
snipe b1cb9259da Re-use total to avoid duplicate count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 18:01:47 +01:00
snipe 03b5c2e246 Fixed bad translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:21:28 +01:00
Brady Wetherington 8df9007a8e Merge branch 'snipeit_v7_laravel10' into develop 2024-05-27 18:08:27 +01:00