DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15219 commits 101 branches 268 tags 320 MiB
Commit graph

5947 commits

Author SHA1 Message Date
snipe 4ac4f9b0a9 Customize cookie name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 14:17:16 +01:00
snipe 09abcb44bb Remove cookie serialization 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-22 13:49:47 +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 6f3eedf5e6 Removed restoreDefaultAvatar method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:25:27 +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 ad85f8be2f Cleaned up 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:55:12 +01:00
snipe c6c006f143 Added restore from demo method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 05:54:40 +01:00
snipe 10856516ac Split out the image deletion into a separate method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 03:40:16 +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 ca7c0aa47c Added default avatar to seeder 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 00:59:25 +01:00
snipe 793cf27318 Fixed use statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-19 22:50:24 +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 c50ab1af67
Merge branch 'develop' into develop 2024-07-19 19:00:56 +01:00
snipe e328dec9f9
Merge branch 'develop' into localizations/more_strings 2024-07-18 18:51:17 +01:00
snipe 822bc6f085 Removed response in form request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 17:37:45 +01:00
snipe 19bd99d159 Updated count 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 17:33:24 +01:00
snipe 9858cc5baf Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 04:43:30 +01:00
snipe 0c4e498df3 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:35 +01:00
snipe b5b60f22d5 Removed int 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 03:48:21 +01:00
snipe f56006fb6b More refactoring 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 01:46:53 +01:00
Marcus Moore 199e68ff29
Simplify computed propery 2024-07-17 17:10:12 -07:00
Marcus Moore 81bffccf01
Use better error message 2024-07-17 16:28:26 -07:00
snipe 79a13e3618 Added numCheckedOut method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:26:58 +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 4c4b0f722a Added qty to email notification 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:25:29 +01:00
snipe 4f3064bdb1 Added store accesstory form request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:24:51 +01:00
snipe 2b0627c1f6 Added accessory checkout request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-18 00:24:28 +01:00
Marcus Moore cfca1514c0
Swap file_id for activeFileId 2024-07-17 16:22:44 -07:00
snipe 345a4306e8 Added SubstituteBindings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-17 23:02:10 +01:00
Marcus Moore b4ed01243b
Add more details 2024-07-17 13:40:41 -07:00
Marcus Moore 3772a21a51
Move comment up 2024-07-17 13:37:24 -07:00
Marcus Moore 04b6cb763f
Add todo 2024-07-17 10:58:48 -07:00
snipe 0ac82fbbe1
Merge pull request #15084 from snipe/fixes_ldap_sync_locale 
Fixes #15067 - updated ldap sync locale to use `app()->getLocale()`
 2024-07-17 18:15:32 +01:00
Godfrey M baa7e7d561 clean up 2024-07-16 20:27:38 -07:00
Godfrey M ffaacc04ef cleaned up calculateDepreciation method 2024-07-16 20:24:18 -07:00
Marcus Moore dd32341502
Display message if attempting to delete non-existent file 2024-07-16 17:21:18 -07:00
Marcus Moore f58e3114a2
Simplify destroy method and update list 2024-07-16 17:17:45 -07:00
Marcus Moore eba494ad8c
Make $activeFile a computed property 2024-07-16 17:03:42 -07:00
Marcus Moore 7e89b58746
Move files to computed property 2024-07-16 16:08:42 -07:00
Marcus Moore b7744105a0
Migrate import type to component 2024-07-16 14:20:41 -07:00
snipe d5e1dc54c6 Use translated strings for action log meta 
This is only partially complete and I mostly hate it

Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 21:35:45 +01:00
Marcus Moore 69263f0e5b
Migrate header row to component 2024-07-16 13:30:29 -07: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
Marcus Moore 017530ba4b
Make updating hook more specific 2024-07-16 12:02:50 -07:00
snipe 45bf428092 Translated “seat” for license seat view 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 19:04:51 +01:00
snipe 4a9bd95ed3 Added language support for select2 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 18:40:10 +01:00
snipe 35160f88e0 Corrected return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-16 16:09:08 +01:00
Marcus Moore c8dad528a8
Migrate a couple items out of mount 2024-07-15 16:15:58 -07:00
snipe ab6b8f520e Fixed field name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:25:37 +01:00
snipe 24e58d1455 Do not update users who already exist since that locale may have been overirrden manually 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:20:04 +01:00
snipe f91ad6b2db Use app()->getLocale() to determine imported user’s language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:15:44 +01:00
snipe eed253bd2f Use app helped instead of facade 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-13 15:15:18 +01:00
snipe d21ebc6f0d Fixed return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-12 11:04:56 +01:00
Marcus Moore 9793016603
Remove unneeded AuthorizesRequests 2024-07-11 13:32:16 -07:00
Marcus Moore 9e06f2d17f
Remove commented code 2024-07-11 13:22:10 -07:00
snipe fb7d533ff7
Merge pull request #15073 from marcusmoore/feature/livewire-url-prefix 
Allow setting a prefix for Livewire's update and asset urls
 2024-07-11 21:04:50 +01:00
Marcus Moore 9dd3827222
Allow setting a prefix for Livewire's update and asset urls 2024-07-11 12:43:29 -07:00
snipe 5697370dfe
Merge pull request #14722 from Godmartinz/unaccepted_reminder_command 
Adds a command to resend acceptance emails
 2024-07-11 20:37:04 +01:00
Godfrey M d4d19569ee adds execution timer 2024-07-11 10:52:47 -07:00
Godfrey M 43c7504f89 adds an all option, adds help context for all, seperates logic 2024-07-11 10:03:51 -07:00
snipe 1527679f4b Handle deletions on the observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:26:43 +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 d4a66f9b6c Use better icon for deleting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 17:00:12 +01:00
snipe 5108b1f3ed Capture the log meta for what was changed 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:35:16 +01:00
snipe 00d7b36c36 Eager load suppliers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:22:22 +01:00
snipe 42dbc894e0 Better handle numRemaining for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:21:45 +01:00
snipe 94bfe7d9c8 Require the user exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 16:18:42 +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 759bb822ff Make sure the user exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:59:18 +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 a7a1a377da Added form request for consumables 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 15:25:07 +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
snipe 498a443230 Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 12:01:06 +01:00
snipe 34b49ef079 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-11 11:59:47 +01:00
Godfrey M 1fa6a763bc updated description 2024-07-10 11:09:57 -07:00
Godfrey M 726308bfd5 removed typo 2024-07-10 10:58:45 -07:00
Godfrey M 22ddb695f2 better description 2024-07-10 10:57:47 -07:00
Godfrey M 09b2feac54 updates assets with selected model to inherit asset model eol 2024-07-10 10:56:44 -07:00
Godfrey M 57e1df86c8 finds model and collects assets with such model 2024-07-10 10:21:24 -07:00
snipe fb10c1439a
Merge pull request #15057 from spencerrlongg/bug/sc-23212-2 
Fixes Potential Exception
 2024-07-10 08:27:59 +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
spencerrlongg 8650923b01 new branch cuz test merge 2024-07-08 12:55:59 -05: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 e98823f7fa Added 403 to sad panda page 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 11:54:49 +01:00
snipe 1d65781d8d More type-hinting 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 07:07:20 +01:00
snipe 0d6fd2643d More tweaks to the form request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 05:59:39 +01:00
snipe 2a796fdc09 Format error 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 03:23:48 +01:00
snipe 34bde52f74 Fixed typos 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 03:21:34 +01:00
snipe 75da626c85 Check for category ID 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 03:21:24 +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 6761ff44cc Removed parens 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-05 00:22:46 +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 d834ef5104 Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 21:52:37 +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 36ae162626 Changed my mind :) 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 16:48:05 +01:00
snipe 00f7cb9dbb Reverse the order for default gravatar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 16:46:12 +01:00
snipe 1ca3dc26eb Removed extra debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 16:36:48 +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 446bc81d3a Updated presenter to use new avatar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:31 +01:00
snipe 9527aac242 Make site name required at the model 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:23:17 +01:00
snipe c57f1f9d7d Use null coalescence 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-04 13:22:56 +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 f1f68b8ef6
Merge pull request #15022 from spencerrlongg/livewire-delete-button 
Resolved Potential Issue when Deleting Personal Access Tokens
 2024-07-03 22:24:25 +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
spencerrlongg a6690493b0 resolved 2024-07-03 16:12:55 -05: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 1553ba5630 Added null coalescence for admin id in case via cli 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:52:12 +01:00
snipe ec24120d2a Allow admin to be nullable (for cli) 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:50:35 +01:00
snipe 50df750202 Add merge event 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:50:23 +01:00
snipe 574867536d Standardize query for merging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 19:41:34 +01:00
snipe e34f3c7c2c Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:32:41 +01:00
snipe 2b2853a183 Added acceptance model 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:29:58 +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 25ba50d6f7
Merge pull request #14870 from Galaxy102/feature/rotate-labels 
Add Label Template: Use with endless 62mm Brother printer rolls
 2024-07-02 08:45:42 +01:00
spencerrlongg 0b60cbc531 remove $rules2 2024-07-01 19:37:49 -05:00
Marcus Moore 3a8f825de5
Link user table counts to section in user show 2024-07-01 14:06:05 -07:00
Konstantin Köhring 6c55e2bd9d Add a Brother compatible 62mm wide label. 
Tested with QL-600. Set print mode to landscape.
 2024-06-28 09:49:53 +02:00
Konstantin Köhring 2fd357c346 Add rotation attribute to Label class to allow rotation of the generated label PDF. 
This is necessary when printing labels with width = label width.
 2024-06-28 09:49:53 +02:00
snipe 7dbcedad40
Merge pull request #14981 from uberbrady/fix_backup_translations 
Fixed #14976, #14975, #14973 - Translation strings aren't always working
 2024-06-27 14:36:52 +01: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 54fb91c03b
Merge pull request #14831 from marcusmoore/chore/sc-23725/livewire3 
Updated Livewire to v3
 2024-06-27 13:21:52 +01:00
Brady Wetherington 6df9742664 Built a workaround for backup notification translations 2024-06-27 13:17:16 +01:00
Brady Wetherington 30cafef9f2 Add a reasonable-looking SAML baseurl, mosty for users behind proxies 2024-06-26 13:25:11 +01:00
Marcus Moore d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-25 10:15:50 -07: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 2b43f3cb84 Added gate to auth service provider 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:40 +01:00
snipe 52c4885335 Added method for checking if the user can edit their own profile 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-24 14:02:17 +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 196db9718e Use class name instead 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:55:58 +01:00
snipe e60dbc883c Removed test code 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:42:34 +01:00
snipe bbbfa91db9 Fixed wonky rule 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:40:26 +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 0e2526f627 Removed comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:32:49 +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 c6a0212384 Merge remote-tracking branch 'origin/master' into develop 2024-06-22 17:33:12 +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 665aa6eb23
Merge pull request #14924 from snipe/fixes/possible_nicer_handling_for_defaultStatusLabel 
Possible fix for #14915 - error on import when status label is not provided and no deployable statuses can be found
 2024-06-21 21:37:22 +01:00
snipe 3531256c3f Fixed deprecations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-21 21:06:43 +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 69cf697aa3 Added 2fa translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:20:52 +01:00
snipe 45dbe5cb77 Return the id, not the entire status label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 15:05:38 +01:00
snipe a1ff35f6ce Possible fix for #14915 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 14:47:46 +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
snipe 6dfedac7a7
Merge pull request #14912 from bryanlopezinc/addIsWritableTest 
Add storage path permissions test
 2024-06-20 13:38:56 +01:00
snipe bd1f43f9ee Added lastname.firstname as email format 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 13:36:48 +01:00
bryanlopezinc 203b60383f Added storage path permissions test for SettingsController@getSetupIndex 2024-06-19 17:46:59 +01:00
snipe 61ced0b221 Merge remote-tracking branch 'origin/develop' 2024-06-19 11:41:11 +01:00
snipe ae7675fee0 Added audit date validation back in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:37:15 +01:00
snipe 66ed26fbf9 Merge remote-tracking branch 'origin/develop' 2024-06-19 11:13:47 +01:00
snipe 7099358985 Added accessor/mutator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:11:50 +01:00
snipe 9a706b3e3e Removed datetime validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:05:31 +01:00
snipe 71c9b03779 Fixed incorrect field name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 11:05:22 +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 20d5587851 Merge remote-tracking branch 'origin/develop' 2024-06-19 10:23:18 +01:00
Marcus Moore f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-18 15:10:46 -07:00
snipe d9f70c16f7 Possible fix proxy/reverse proxy 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 14:44:35 +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 cb6ea2c6fb Merge remote-tracking branch 'origin/develop' 2024-06-18 09:59:43 +01:00
snipe 2f59bb74cd Prefaced fields with “users” for clarity 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 09:52:41 +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
Marcus Moore d9164281ab
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	resources/views/livewire/oauth-clients.blade.php
 2024-06-17 12:57:04 -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
Marcus Moore c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3 2024-06-12 15:12:40 -07: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
Marcus Moore c51b7d7104
Inline variable 2024-06-10 12:22:23 -07:00
Brady Wetherington c8820adb56 Add two new 'with()' relationships to Users API index query 2024-06-10 13:29:53 +01:00
snipe 0f4c6dd5b0
Merge pull request #14830 from snipe/chore/sc-25756/better_validation_for_relations_on_delete 
Better validation for relations on delete
 2024-06-07 18:10:41 +01:00
bryanlopezinc d35e251d6e Added test for app url config 2024-06-05 21:46:43 +01:00
snipe 871255f28c Fixed #14812 - added consumables to individual inventory report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 20:40:45 +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 1cdec61be6 Use more modern mutator/accessory syntax 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:56:54 +01:00
snipe b0ddb26e73 Fixed variable name, $field 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 9d9ad86dd5 Added mutators and accessors for dates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe afe4e5d62e Added date parser 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 52950f1322 Refactored date parsing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 026c80992e Pull the log reference 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 0ee2b74ff3 Added date parsers for new date fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 3a0f7eca54 Put asset EOL date back in the Item Importer 
I have no idea why this is necessary

Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 10:28:35 +01:00
snipe 4ccbfb56a4 Make sure the status label is deployable 
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 c8279c0b99 Moved asset-only date stuff into the asset importer 
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 b2a86e312b Added last_checkout and last_checkin as fillable 
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 9fccafa3ac
Merge pull request #14816 from uberbrady/hotfix_autoincrement_workaround 
Don't save next autoincrement base if it's going to fail, next
 2024-06-05 09:47:40 +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
Marcus Moore 99439f0a5c
Define property 2024-06-04 16:14:07 -07:00