DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 14:09:43 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
14001 commits 101 branches 268 tags 288 MiB
Commit graph

3606 commits

Author SHA1 Message Date
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 cacb5d62dc
Merge pull request #14800 from snipe/fixes/importer_tweaks 
Importer tweaks
 2024-06-12 12:51:11 +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 7ac315e1eb Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 14:50:45 +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 5bd9ecb8df Created DeleteUser request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 13:28:37 +01:00
snipe 026c80992e Pull the log reference 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe d02904c9a3 Added new fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe f4f184e115 Removed noisy debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +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
Marcus Moore 1a1b891309
Remove unused Login Livewire component 2024-05-30 16:49:05 -07: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