DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
14885 commits 96 branches 267 tags 295 MiB
Commit graph

3050 commits

Author SHA1 Message Date
snipe effd273245
Merge pull request #14458 from spencerrlongg/bug/sc-24884 
Add Form Request and Tests for Update Asset API Method
 2024-07-23 20:57:47 +01:00
Brady Wetherington d893de2b7e Merge branch 'develop' into fix_setup_ssl_check 2024-07-23 20:24:38 +01:00
Brady Wetherington 7f7cfef81b Mark test as Incomplete, and downgrade error back to debug for tests 2024-07-23 20:24:05 +01:00
spencerrlongg 1139ed676a $id to $asset->id (thanks tests) 2024-07-23 13:03:25 -05:00
Spencer Long 64be353156
Merge branch 'develop' into bug/sc-24884 2024-07-23 12:55:19 -05:00
snipe 175862d3c9 Added route param to message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-23 16:37:01 +01:00
Brady Wetherington 5eea08088d Improve .env file checking to not validate SSL certificates 2024-07-23 16:03:02 +01:00
snipe 38affea3f3 More updates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:57:10 +01:00
snipe 254e2f120b Added clone to consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:40:32 +01:00
snipe 2bfee0c29a Few more tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 16:21:11 +01:00
snipe 8fc5c0b5be Use other default avatar, not in the avatars directory 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:34:40 +01:00
snipe 241eb7b031 One more bad sig 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:06:27 +01:00
snipe ca399794c3 Fixed incorrect signature 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:05:01 +01:00
snipe 736d4cc59a Use new deleting method in ImageUploadRequest 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:34 +01:00
snipe e373be7dde Skip deleting default avatar from disk on delete 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 01:01:27 +01:00
snipe 94619e3284 Fixed #15121 - bulk delete restore logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 19:56:58 +01:00
snipe e328dec9f9
Merge branch 'develop' into localizations/more_strings 2024-07-18 18:51:17 +01:00
snipe d9b7df5b85 Added form requests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:26:42 +01:00
snipe 0c933bcc5d Cleaned up controllers, use form requests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:42 +01:00
snipe 7f412ec3f5 Missing string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:14:41 +01:00
Godfrey M 5bb47e290f validates percentage on store and new depreciations 2024-07-16 13:07:12 -07:00
snipe 70d95877d8 Translations for license checkout errors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:02:58 +01:00
Godfrey M 48821f8391 updates transformer, api controller 2024-07-16 12:58:23 -07:00
Godfrey M aaa2858337 battling with handling depreciation percentage and amount 2024-07-16 12:25:19 -07:00
snipe 35160f88e0 Corrected return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 16:09:08 +01:00
snipe d21ebc6f0d Fixed return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-12 11:04:56 +01:00
snipe c2fe3b5459 Use the observer to delete associated files and detach users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:00:38 +01:00
snipe 00d7b36c36 Eager load suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:22 +01:00
snipe b10441c928 Detach associated pivot records 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:01:18 +01:00
snipe 9676d934d2 Drop the with users on the create checkout screen 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:00:08 +01:00
snipe abd79219dd Use form request to check for valid category 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:26:24 +01:00
snipe 82743abadc Cleans up the consumables index controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 14:15:18 +01:00
spencerrlongg 6932a63217 make some naming a little clearer 2024-07-09 16:32:44 -05:00
snipe 1a1ccd6bdc Type constrains one more time - who thought this was a good idea? 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 19:50:58 +01:00
snipe 34e1ff88db Added StreamedResponse 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:41:50 +01:00
snipe 8a547dab20 Fixed type constraint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:35:57 +01:00
snipe 5597992d63 Fixed API key missing translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 13:17:46 +01:00
snipe 595408d21f On more binaryfile response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 11:54:07 +01:00
snipe 491a0f3959 One more typehint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-09 11:47:53 +01:00
snipe bf060d43a7 Fixed typehint on assets controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:02:11 +01:00
snipe 9b838cedd1 Fixed typehint on asset model files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 22:00:45 +01:00
snipe 9c304f238a
Merge pull request #15029 from snipe/fixes/small_docblock_fixes 
General cleanup - Docblock fixes, adding type hinting, added tests, added asset model form validator
 2024-07-08 17:43:50 +01:00
snipe 202f5077de Removed return 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 17:41:20 +01:00
snipe eba24b9242 Removed custom fieldsets on auditing - it’s not used 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-08 13:19:05 +01:00
snipe 1d65781d8d More type-hinting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 07:07:20 +01:00
snipe 2a796fdc09 Format error 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 03:23:48 +01:00
snipe 5ebcc3b1a0 More type hinting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 02:36:55 +01:00
snipe 96d1aea54a More cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 00:54:50 +01:00
snipe 7215746d7a Prevent users from editing category types if there are still items 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 00:23:02 +01:00
snipe d3b62aa918 Few more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 22:52:49 +01:00
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