DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 11:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15643 commits 96 branches 267 tags 296 MiB
Commit graph

6122 commits

Author SHA1 Message Date
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
Marcus Moore 5eb5742b3d
Define property 2024-06-04 15:49:39 -07:00
Marcus Moore 296cf3e34b
Update OauthClients component 2024-06-04 15:37:41 -07:00
snipe 6229d0c616
Merge pull request #14758 from U-H-T/features/add_logo_support_for_Brother_TZe24 
add logo support for Brother TZe24mm labels
 2024-06-03 17:02:18 +01:00
snipe 877adb082c Fixed translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-03 16:40:52 +01:00
Brady Wetherington 90818bb147 Don't save next autoincrement base if it's going to fail, next 2024-06-03 15:58:57 +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 b156264684 Tidied up scoping to be better for testing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 23:10:53 +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 06e9625c64 Use hasUser() to avoid table collisions and infinite loop 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:58:07 +01:00
snipe 5800e8d8e9 Added companyable trait 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:57:34 +01:00
snipe 623aa58163 Removed unused statement 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-31 06:57:25 +01:00
Marcus Moore 1736bf5510
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	app/Livewire/LoginForm.php
#	package.json
#	resources/views/livewire/login-form.blade.php
 2024-05-30 16:56:50 -07:00
Marcus Moore 1a1b891309
Remove unused Login Livewire component 2024-05-30 16:49:05 -07:00
snipe 5a5d171ba2 Put session facade back - derp 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-30 14:15:08 +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
Marcus Moore 17f0ac1eae
Set view correctly 2024-05-29 12:57:43 -07:00
Marcus Moore 8ff639913d
Migrate away from dispatchBrowserEvent() 2024-05-29 12:17:36 -07:00
Marcus Moore b52380f376
Migrate to new namespace 2024-05-29 12:07:48 -07: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 8ac3937bf4 Commented model loading on asset model 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 18:03:19 +01:00
snipe 1c1729854e Use statics for location, supplier, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 18:02:22 +01:00
snipe 14c78d9065 Use static for custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 18:02:09 +01: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
snipe 3df2a4a70b Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:16:44 +01:00
snipe 6b41970e97 Check that selected is an array 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:15:31 +01:00
snipe 92eb6eb1b6 Add unique constraint to name 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-28 15:09:31 +01:00
Brady Wetherington 8df9007a8e Merge branch 'snipeit_v7_laravel10' into develop 2024-05-27 18:08:27 +01:00
snipe 485caf1d92
Merge pull request #14755 from marcusmoore/chore/sc-25103/add-tests-around-asset-checkout 
Added tests around asset checkout
 2024-05-25 11:33:33 +01:00
Godfrey M 442903ea5e trying to get link to work, fixed up markup and url 2024-05-23 16:08:18 -07:00
spencerrlongg 8ce577db37 adds @snipe's rules for undeleted assigned targets 2024-05-23 15:51:26 -05:00
Godfrey M d3ab152d30 adds reminder notification constructor and updates markdown 2024-05-23 12:47:02 -07:00
Spencer Long cdb1140f10
Merge branch 'develop' into bug/sc-24884 2024-05-23 13:53:00 -05:00
U-H-T 2777ac96cc add logo support for Brother TZe24mm labels 2024-05-23 11:10:23 +02:00
snipe 8b3ff5a82d Handle potentially deleted admin users in license export 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-23 08:39:15 +01:00
Marcus Moore 8d74a976a1
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-05-22 16:09:27 -07:00
Marcus Moore 6d104251b3
Remove todo 2024-05-22 15:40:54 -07:00
Marcus Moore f16c79bb9a
Improve event assertions 2024-05-22 15:38:23 -07:00
Marcus Moore c7fa2c04ad
Add scenario 2024-05-22 13:33:12 -07:00
Marcus Moore 8ca882d1c8
Complete a scenario 2024-05-22 13:23:49 -07:00
Brady Wetherington 4adbd7af4c Merge branch 'develop' into snipeit_v7_laravel10 2024-05-22 21:02:11 +01:00
snipe 4bb7c1701f Fiddled with storage facade a little more 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:44:49 +01:00
snipe 5fd0f56258 Use proper storage facade for checking if the file exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:38:49 +01:00
snipe 37d7e89e93 Fixed error message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:29:43 +01:00
snipe 3ab197075a Nicer handling of erroring when filename+log do not match 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:20:03 +01:00
snipe bb96a190fd Moved validator 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 12:34:48 +01:00
Godfrey M f2693ee957 conditionally fixed redirect select option 2024-05-21 14:08:35 -07:00
Godfrey M 69c2cf2c4f fixed assetcheckin test, created redirect option test 2024-05-21 13:13:25 -07:00
Godfrey M 8a0afae90f fixed query, fixed no email logic, needs new markdown 2024-05-21 09:42:00 -07:00
snipe 34f1ea1c0e Re-order gating and refactor group syncing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-21 10:00:49 +01:00
Godfrey M a53f89cd2c remove license checkout changes p2 2024-05-20 10:26:45 -07:00
Godfrey M 280c03dcad remove license checkout changes 2024-05-20 10:25:59 -07:00
Godfrey M e70fb42f87 remove license redirects 2024-05-20 10:22:01 -07:00
Brady Wetherington f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
snipe 771c85e347 Translated account save message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-20 11:19:31 +01:00
snipe ca1555d962 Fixed #14664 - allow additional urls in env for CSP 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 22:19:18 +01:00
snipe 54b24434e1 Set file name variable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 19:56:58 +01:00
snipe 88d131666c Sets purchase date as date (versus datetime) in labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 18:40:49 +01:00
snipe eb0fd2f519 Removed stricter validation :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 16:29:11 +01:00
snipe 81efaa7481
Merge branch 'develop' into fixes/add_next_audit_date_to_assets_form 2024-05-16 16:13:21 +01:00
snipe 6b3346d90c Only attempt to decrypt if there is a value 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:28:25 +01:00
snipe 312ce51de6 Removed more debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:25:57 +01:00
snipe 09914f508f Removed more debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:16:52 +01:00
snipe 45eda0f611 Removed debug lines 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 15:09:27 +01:00
snipe de088d452f
Merge pull request #14451 from Godmartinz/add_decline_note_to_acceptance 
Adds a note text area to asset acceptances/declines
 2024-05-16 15:06:05 +01:00
Godfrey M fb9a5f928f removed license changes 2024-05-15 16:39:26 -07:00
Godfrey M c658a0fcb4 fixes description 2024-05-15 13:20:05 -07:00
Godfrey M f40284c413 adds acceptance reminder command 2024-05-15 13:04:58 -07:00
snipe 55281313d8
Merge pull request #14474 from Godmartinz/asset-location-update-bug 
Fixed user assets not updating when a user changes location
 2024-05-15 19:20:14 +01:00
Godfrey M 786799225c remove dd 2024-05-15 10:37:07 -07:00
snipe c137fafa97 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 18:10:43 +01:00
snipe cb22a3d556 Updated comments again :-/ 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 17:52:50 +01:00
snipe c7accb4599 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 17:38:42 +01:00
snipe c1d5b8713b Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 8310b91e00 Use UploadFileRequest for audit files 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe 71b5bf2eef Added visual on the hardware view screen 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:48 +01:00
snipe bdbfb0f2a1 Added accessor and mutator for next_audit_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe e5653eaa93 Save new data 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe 3c4098038d Fail early if no tag 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-15 16:33:47 +01:00
snipe eb09a99eb0
Merge pull request #14707 from spencerrlongg/bug/sc-24912 
Bulk Edit Tests and Tweaks
 2024-05-15 11:22:31 +01:00
Godfrey M dc418a7033 need to make variables names uniform 2024-05-14 14:09:54 -07:00
Godfrey M 15cc4345ab adds dynamic redirects to Assets 2024-05-14 13:25:52 -07:00
Godfrey Martinez 5272824d85
Merge branch 'develop' into asset-location-update-bug 2024-05-13 10:47:25 -07:00
snipe 9bce0f2ff7 Format fix 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-13 18:19:14 +01:00
snipe d2e7e11dca Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-13 12:48:28 +01:00
Jeremy Price 2adc4ffa96 Fix memory-hog query in AssetCountForSidebar middleware 
https://github.com/snipe/snipe-it/pull/14702/files introduced a bug
where instead of doing a quick `select count(*)` of assets, it did a `select *` of
assets, moving the count from the database to the PHP process.

This caused OOM issues in memory-constrained environments with lots of
assets, and also presented a speed issue even when memory limited were
increased.

Additionally, given this populates the sidebar, this was likely an issue
on every page load that included the sidebar.

The fix is simply removing the `all()->`, ending up with Asset::count(),
which yields the desired `select count(*)` DB query.
 2024-05-10 12:54:40 -07:00
snipe 46779ca865
Merge pull request #14697 from snipe/bug/sc-25502/disable_delete_if_not_deletable_user 
Fixed UI where delete button was not disabled even if the user couldn't be deleted
 2024-05-08 12:06:33 +01:00
Tobias Regnery b2a5d86e30 Fixes #14701 - wrong total asset count 
The total asset count in the sidenav shows the ready to deploy count instead of the total count.
Fix this by adjusting the query to all assets. Also respect the setting for archived assets.
Add a default value for total assets, since we are now using the settings-variable, which is not available during the setup process.

While at it, move the block for total assets before the ready to deploy assets to match the ordering of the sidenav.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
 2024-05-08 09:34:35 +02:00
spencerrlongg ad2ba252ee two new test 2024-05-07 15:11:33 -05:00
spencerrlongg 17ef20ea92 alright, in a working place 2024-05-07 14:08:47 -05:00
snipe 8c327e6523 Handle user not found properly 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 19:16:56 +01:00
snipe a7aa178f24 Used localized strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 17:56:07 +01:00
snipe 97bc4a092f Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 17:40:48 +01:00
snipe d942b8f1fb Fixed alias names 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 17:40:35 +01:00
snipe 49dc9767b6 Added debugging :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 15:54:43 +01:00
snipe 482965197d Added users, locations to presenter, transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 12:07:41 +01:00
snipe 410b547f3c Added users and locatipon count to API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 12:07:28 +01:00
snipe f769e8247f Added ManagedUsers method, additional checks in isDeletable() 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 12:07:15 +01:00
snipe 4f12c86e74 Fixes #14692 - set default variables for sidebar totals 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-07 08:34:22 +01:00
Marcus Moore 7e9c8ba290
Remove duplicate settings call 2024-05-06 17:08:16 -07:00
Marcus Moore 6f639f7bf0
Load settings properly in SendUpcomingAuditReport command 2024-05-06 16:44:14 -07:00
Brady Wetherington 5b02a43957 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-06 18:44:03 +01:00
Godfrey M c94a7613ca dropdown redirect options, helper function and session variable added 2024-05-02 12:16:20 -07:00
snipe dab5874fd7
Merge pull request #14391 from snipe/features/add_Brother_188mm_tape_label 
Added Brother 18mm label type
 2024-05-02 13:14:04 +01:00
snipe 4850227c04
Merge pull request #14655 from snipe/feature/sc-25381/simpler_overdue_endpoints 
Refactored due/overdue for audit, added due/overdue for checkin API endpoint and GUI
 2024-05-02 13:11:51 +01:00
snipe eb9a654cc3 Moved settings call higher 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:37:41 +01:00
snipe 4224bc0c43 Removed extra settings param 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-02 12:36:57 +01:00
Robert-Azelis 3ea5d4ee40
Update BulkAssetsController.php 
Fix for bulk updarte of purchase date to calculate new EOL
 2024-05-02 12:55:17 +02:00
spencerrlongg e177993bcc notes and some playing around, push for eod 2024-05-01 16:57:11 -05:00
spencerrlongg 25480293dc change keys to values, add test 2024-04-30 18:03:26 -05:00
snipe 19cff25300
Merge pull request #14651 from marcusmoore/bug/sc-25402 
Fixed `purchase_cost` not being allowed to be a string when creating asset via api
 2024-04-27 03:39:10 +01:00
snipe 848e1fe1f6 Refactored audit alerts 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:26:00 +01:00
snipe fe147adec3 Refactor checkin alert 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:10:54 +01:00
snipe 103809b65f Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:01:43 +01:00
snipe a398496dd4 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 21:01:27 +01:00
snipe 839db8ef44 Refactored due-or-overdue methods 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 20:59:27 +01:00
snipe 50d8b02f8b Removed unused scope 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:23:27 +01:00
snipe 860764a436 Use totals for sidebar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:12:21 +01:00
snipe 52d6a8990a Check that the asset is not already checked in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:06:46 +01:00
snipe 3f04afee5c Removed unused method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:26 +01:00
snipe 2117f61e8c More view sharing for sidebar 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:15 +01:00
snipe d40604b574 Removed debugging, added date cast 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 19:01:05 +01:00
snipe 6dc9ccffcd Refactor api for handling audit/expected checkins 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 18:56:57 +01:00
snipe bf058bd5c6 Use updated scopes 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:56 +01:00
snipe dfaf01e8aa Updated asset counters 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:47 +01:00
snipe 2e92ee8eee Switch to whereBetween so tests run on sqlite 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-26 14:02:23 +01:00
Marcus Moore 2a71877bec
Add additional condition 2024-04-25 17:04:07 -07:00
Marcus Moore 30bd920497
Add conditional 2024-04-25 16:24:12 -07:00
Marcus Moore 1d5b48b88d
Add comment and improve method 2024-04-25 16:22:15 -07:00
spencerrlongg 03f091a77f ammended note, got real rule in there 2024-04-25 17:17:42 -05:00
Marcus Moore 3a2eeaea7a
WIP: Future-proof rules being converted to array syntax 2024-04-24 17:40:40 -07:00
Marcus Moore 12418ae91b
WIP: allow EU style purchase cost via api 2024-04-24 17:18:29 -07:00
Brady Wetherington 3f5c5cbe82 Merge branch 'develop' into snipeit_v7_laravel10 2024-04-24 16:24:43 +01:00
snipe 2439758ef3
Merge pull request #14587 from Godmartinz/License-export-button 
Added a License Export function and button
 2024-04-24 04:42:56 +01:00
spencerrlongg 8696a423b0 another option 2024-04-23 17:38:40 -05:00
spencerrlongg 107f8db9bc another option 2024-04-23 17:35:33 -05:00
spencerrlongg b11c900a4c fix bracket, + overwrite required rulesets 2024-04-23 16:29:07 -05:00
akemidx ac4aa97103 develop reheading 2024-04-23 17:05:50 -04:00
akemidx 0bc93c6a1e space 2024-04-23 15:31:37 -04:00
Spencer Long 53ccd196d7
Merge branch 'develop' into bug/sc-24884 2024-04-23 13:57:59 -05:00
snipe 685f1cbfb8
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels 
Removed encrypted fields from label options
 2024-04-23 13:31:38 +01:00
snipe bdd43b7134
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields 
Re-enabled updating encrypted custom fields via API [sc-41465]
 2024-04-23 10:20:55 +01:00
Godfrey M 96b3af7cbc fixed view from sending all custom fields 2024-04-22 18:27:34 -07:00
Godfrey M 5fc6771543 adds licenses available, updated teranslations 2024-04-22 17:58:49 -07:00
akemidx 0d049a0be7 conflict resolution 2024-04-22 20:09:40 -04:00
akemidx 01c24ab4cd translating text 2024-04-22 19:16:14 -04:00
Godfrey M 14ddf36d46 removed two duplicate translations 2024-04-22 10:43:11 -07:00
Godfrey M 25f1167c9d adds company scoping to license export 2024-04-22 10:38:55 -07:00
Godfrey M 420225c2d5 Merge branch 'refs/heads/develop' into License-export-button 2024-04-22 10:33:30 -07:00
snipe 2aa3ce15bd Removed escaping on notes for file uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-22 14:55:02 +01:00
snipe 8dd71f99cc Added ico, image/x-icon,image/vnd.microsoft.icon to favicon validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-22 13:54:19 +01:00
snipe 424cbd3248 Removed noisy debug 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-18 14:25:54 +01:00
akemidx e8d9701a26 array key existing 2024-04-17 19:16:25 -04:00
snipe 6f195cb8ec
Merge pull request #14591 from snipe/bug/sc-25258/naive_fix_for_user_scoping 
First fix for user FMCS scoping
 2024-04-17 21:49:53 +01:00
snipe 4450351b75 Only sync groups if API user is superadmin 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 11:06:50 +01:00
snipe 9bb15aaf1b Added individual gates to keep response consistent with other company-ed things 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:57:49 +01:00
snipe 65dd729e19 Additional gates 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 10:57:20 +01:00
snipe 5e8c129c7f Revert accidental commit 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 09:26:50 +01:00
snipe ab3b5ca4ef Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-17 09:26:07 +01:00
snipe a8d48b758e
Merge pull request #14594 from marcusmoore/bug/sc-25314/multiple-label-fields-on-one-row 
Fixed label fields only showing first option
 2024-04-15 18:53:03 +01:00
Brady Wetherington 67a8e0b5c6 This re-enables the ability to update encrypted custom fields via the API 2024-04-15 18:46:11 +01:00
snipe 7b7d424962
Merge pull request #13880 from Godmartinz/department-validation-bug 
Fixed department validation to allow updates
 2024-04-12 10:50:26 +01:00
Marcus Moore a4e959818a
Add comment 2024-04-11 17:23:28 -07:00
Marcus Moore c3a71cc182
Improve variable names and add comment 2024-04-11 16:44:13 -07:00
Marcus Moore da03cfdbe5
Formatting 2024-04-11 16:39:29 -07:00
Marcus Moore 2b137d76fa
Trim string to avoid leading whitespace if label is empty 2024-04-11 16:38:22 -07:00
Marcus Moore 81b8c111ca
Allow multiple fields to be displayed in one row 2024-04-11 15:00:14 -07:00
snipe c604f08749 Small tweaks for troubleshooting :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 18:47:55 +01:00
snipe da21424416
Merge pull request #14581 from marcusmoore/bug/sc-25237 
Fixed assigned to field in new label engine
 2024-04-11 15:36:18 +01:00
snipe 0d23d28a65 Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 15:15:56 +01:00
snipe 710370ac24 Added scoping for destroy 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:58:25 +01:00
snipe ed0a441e4d Refactor destroy method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:52:03 +01:00
snipe 24e87cc0bb Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:51:49 +01:00
snipe 460693c153 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:40:13 +01:00
snipe f54a94bd4c Refactorered methods 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:40:00 +01:00
snipe a19b86add0 Re-ordered scoping for admins, added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-11 14:39:37 +01:00
Marcus Moore 5567a1e9ac
Formatting 2024-04-10 17:37:11 -07:00
Marcus Moore f28a82de71
Implement some tests, scaffold others 2024-04-10 17:27:07 -07:00
Marcus Moore 7c2fae7b9d
Scaffold api test cases 2024-04-10 17:08:45 -07:00
Marcus Moore 4434de6241
Add test case 2024-04-10 15:47:26 -07:00
Godfrey M a2bca0e358 fixed comments 2024-04-10 15:05:21 -07:00
Marcus Moore 6d572424ac
Add validation around dates 2024-04-10 14:02:25 -07:00
Marcus Moore 7dbf8a8a8e
Add tests for asset and location check out 2024-04-10 13:28:52 -07:00
Godfrey M 0849262243 fixed notes 2024-04-10 12:19:34 -07:00
Godfrey M 17095feb33 fix typo 2024-04-10 12:15:48 -07:00
Godfrey M f42ae46338 exports all licenses 2024-04-10 12:14:44 -07:00
Godfrey M e2679852ce added export button, half the logic for export method 2024-04-10 11:31:30 -07:00
Marcus Moore deaba46e1c
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout 2024-04-10 11:01:35 -07:00
snipe 989dab6259 Moved company scoping methods to group them together 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-10 14:35:13 +01:00
snipe adacdc038d Apply company scoping for users 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-10 12:34:32 +01:00
Marcus Moore 1aeaa0094a
Fix assigned to in labels 2024-04-09 13:52:54 -07:00
spencerrlongg 99d7155729 translation strings 2024-04-07 19:50:53 -05:00
spencerrlongg f30439a544 small refactor, pretty much good to go now though 2024-04-07 17:07:46 -05:00
spencerrlongg 997eddfed1 cleanup + notes for monday 2024-04-04 18:23:03 -05:00
Godfrey M d548b800d5 nullifies location after ldap user sync 2024-04-04 15:43:33 -07:00
spencerrlongg 52340aca78 just about wrapped up 2024-04-04 17:41:10 -05:00
spencerrlongg e1fb446888 this is a pretty good start, need to know about other PR 2024-04-04 14:20:03 -05:00
snipe e11287ec25 Redirect on checkin if the asset is already checked in 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 15:00:55 +01:00
snipe a72d4e5dc1 Fixed ambiguous id clause in custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-04 14:23:58 +01:00
spencerrlongg 0a90df2b14 alright conflicts resolved 2024-04-03 14:40:14 -05:00
Spencer Long 4ab75c1c03
Merge branch 'develop' into bug/sc-24884 2024-04-03 14:08:41 -05:00
Godfrey M 08f9aae8ae adds note to log listener and checkout accept notif 2024-04-03 11:59:47 -07:00
Godfrey M ce1d677cdc adds note to acceptance 2024-04-03 11:36:03 -07:00
Godfrey M bb2c73348d only grabs custom Fields that are not encrpyted 2024-04-03 11:03:58 -07:00
Godfrey M 4327653d70 remove db cleaner for encrypted selections 2024-04-03 10:57:41 -07:00
Brady Wetherington 65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10 
Hopefully, last merge?
 2024-04-02 20:34:04 +01:00
steve@degga.net bf10fd0cf0 Rename dynamicUrl() method 2024-03-31 22:37:41 -04:00
steve@degga.net f7bbec6be4 Makes all manufacturer URLs dynamic, not just warranty lookup. 2024-03-31 22:18:44 -04:00
snipe f42e5d5292 Reverting the store/update asset API responses for now 
This currently breaks the Jamf integration - need a better longer term plan.

Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 21:58:49 +00:00
akemidx 721902c2d4 committed for later 2024-03-28 16:44:44 -04:00
snipe 1f2d30ebf4 Check that the array key exists 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-28 12:25:29 +00:00
akemidx e6b366020a lots of attempts and syntax, but no go 2024-03-27 19:05:59 -04:00
snipe 0d3d172108 Make last_checkin searchable and fillable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 20:37:40 +00:00
snipe 86677b5f13 Make last_checkin sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 20:37:25 +00:00
spencerrlongg cec84b857b fixed last audit date + test 2024-03-27 14:39:23 -05:00
Robert Spadaro ccd00caa70 Wrap where logic in additional where statement to protect appended params 2024-03-27 15:36:00 -04:00
spencerrlongg 1d4a7a7b02 added audit dates 2024-03-27 14:05:30 -05:00
snipe 545a185614
Merge pull request #14262 from akemidx/bug/sc-24812 
Last Checkin Date added to Hardware View and Index
 2024-03-27 19:02:25 +00:00
spencerrlongg 701411c1b9 get rid of a couple unnecessary changes 2024-03-27 13:53:57 -05:00
Spencer Long 013463aafc
Merge branch 'develop' into bug/sc-24884 2024-03-27 12:45:45 -05:00
snipe 8bc9688d71 Added ability to filter on category ID and model ID from user’s asset API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-27 16:04:00 +00:00
spencerrlongg 39c15b2868 reformat array 2024-03-27 10:35:25 -05:00
Godfrey M aa8af2220c trying to remove an encrypted field but not all fields 2024-03-26 16:10:08 -07:00
snipe ae403da8c1
Merge pull request #14502 from marcusmoore/bug/sc-25004/pwd_secure_complexity-validation 
Added validation around `pwd_secure_complexity`
 2024-03-26 20:05:04 +00:00
snipe 850f85ff59
Merge pull request #14369 from spencerrlongg/bug/sc-24343 
Add new validator for custom field checkboxes and fix asset model default updates
 2024-03-26 19:22:29 +00:00
snipe 3ced85080a Fixed #14495 - Allow user_id to be passed to limit to only specific admins 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 14:45:20 +00:00
Phil J R afe1cb8234
Create LabelWriter_1933081.php 
Added a longer version of the existing label (25 x 54mm vs. 25 x 89mm) due to better availability and to support longer asset names.
 2024-03-26 08:29:47 +00:00
Phil J R f836342194
Rename Label_Writer_2112283.php to LabelWriter_2112283.php 
Fix the name of LabelWWriter_2112283 to be consistent with the existing one.
 2024-03-26 08:16:00 +00:00
spencerrlongg 5cf1a6c300 new validator for radio buttons 2024-03-25 21:03:13 -05:00
Marcus Moore 5815607924
Add validation for pwd_secure_complexity 2024-03-25 17:45:41 -07:00
Marcus Moore 57d1c036ec
Improve method name 2024-03-25 13:53:30 -07:00
Marcus Moore 71722b753d
Little bit of clean up 2024-03-25 13:49:03 -07:00
Marcus Moore a2625c889a
Improve comment 2024-03-25 13:48:32 -07:00
Marcus Moore c98b9da612
Pass last_audit_date through for model level validation if not a date 2024-03-25 13:47:24 -07:00
Marcus Moore 5f4c964309
Account for last_audit_date not being provided 2024-03-25 12:45:11 -07:00
Marcus Moore 66ba96d531
Set last_audit_date to valid format in StoreAssetRequest 2024-03-25 12:38:12 -07:00
Phil J R e45fd4088f
Created Dymo LabelWriter Label 2112283 
I have added the layout for the Dymo LabelWriter 2112283 Labels.
They are: DYMO 2112283 DURABLE SMALL MULTI PURPOSE LABELS (160 LABELS) - 25 X 54MM
 2024-03-25 16:31:20 +00:00
spencerrlongg 7e4a0eedf0 rm dumb note 2024-03-25 10:46:26 -05:00
Godfrey M 633249b08a user assets get updated when a user changes location 2024-03-21 15:15:40 -07:00
Godfrey M 21c3b1fbd2 rename declined message to note, increased width of textarea 2024-03-21 14:03:25 -07:00
snipe e9e6f925bf Updated validation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-21 18:34:39 +00:00
snipe 828b84084d Added validation for last_audit_date and next_audit_date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-21 18:29:38 +00:00
spencerrlongg be282dd038 resolve a couple issues 2024-03-21 09:26:45 -05:00
snipe c4b7e77498
Merge pull request #14089 from spencerrlongg/bug/escaped_quotes_in_listbox 
Use `htmlentities()` instead of `htmlspecialcharacters()` on Custom Field Listbox Values
 2024-03-21 12:55:25 +00:00
snipe 91c7180bfd
Merge pull request #14469 from snipe/feature/sc-19515/2fa_reset_log 
Added 2FA reset log entry
 2024-03-21 12:52:22 +00:00
snipe 7c39f516b9
Merge pull request #14421 from marcusmoore/fixes/add-minimal-validation-around-asset-tags 
Adds a minimal amount of validation around asset_tags in AssetsController
 2024-03-21 00:04:44 +00:00
snipe 5ed2bd0fb7 Skip the normal edit observer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:52:22 +00:00
snipe bc908b854d Added icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:44:47 +00:00
snipe 2067b1138a Added the log item 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 23:43:58 +00:00
Marcus Moore 530291f81c
Implement some tests 2024-03-20 14:28:27 -07:00
snipe de18e449a6
Merge pull request #14464 from snipe/features/toggle_all_columns 
Added "toggle all" to column selector
 2024-03-20 21:26:23 +00:00
snipe dce19e0bea Set names and actions to switchable = false 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 21:25:50 +00:00
spencerrlongg e7b9903341 delete some extra lines 2024-03-20 15:29:06 -05:00
spencerrlongg e3e01e07b1 final cleanup 2024-03-20 15:23:45 -05:00
spencerrlongg d18aa1db98 some more cleanup + tests 2024-03-20 15:18:15 -05:00
spencerrlongg fdf0be09db all tests passing 2024-03-20 13:43:01 -05:00
Spencer Long b4b4927370
Merge branch 'develop' into bug/sc-24884 2024-03-20 12:36:39 -05:00
snipe 321414f6e3 Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:38:48 +00:00
snipe 7787fe42c8 Added avif to helpers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:30:28 +00:00
snipe 3b66912742 Fixed #14460 - added support for avif 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:25:02 +00:00
snipe 278a25c63b Added toggle all to column selector 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:14:41 +00:00
snipe 417caae589 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 12:07:18 +00:00
spencerrlongg 0ffceb9691 some notes and a little progress 2024-03-20 00:07:52 -05:00
spencerrlongg 1e810d2426 most tests now passing, still one broken 2024-03-19 19:47:26 -05:00
spencerrlongg c0110e7f29 some more tests and refinement 2024-03-19 19:27:35 -05:00
Godfrey M 62745923cf fixes API location delete 2024-03-19 15:25:28 -07:00
Godfrey M 090466123f add withCount to query instead 2024-03-19 15:18:18 -07:00
Godfrey M 38a3e36cd6 fixes translation usage 2024-03-19 14:32:21 -07:00
Godfrey M e8dc634a40 fixes translation usage 2024-03-19 14:30:53 -07:00
Godfrey M 0d0984a400 Bulk Delete Locations does not work [sc-25100] 2024-03-19 14:26:40 -07:00
Godfrey M b9986033cc removed abbr. of variable, changed variable types in migration 2024-03-18 16:03:40 -07:00
Godfrey M 01afa9a749 declined notes are reflected in the action logs 2024-03-18 10:50:15 -07:00
Godfrey M 57f5d4a570 deleted_msg saves to db 2024-03-18 10:45:47 -07:00
Godfrey M 4588393b76 adds declined msg to mail notif, updates lang files and checkout acceptance controller 2024-03-18 10:25:55 -07:00
snipe 7bae4c39c6
Merge pull request #14401 from uberbrady/fix_locale_warning 
Fix [sc-25008] - correct and improve legacy language warnings
 2024-03-14 15:42:28 +00:00
snipe cce8cb4f5e Move requestable scope below sorting, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-14 13:24:22 +00:00
spencerrlongg f6ab0f8f46 lots of cleanup to do, but this DOES work 2024-03-13 15:57:10 -05:00
spencerrlongg f01b205486 some changes 2024-03-13 15:10:51 -05:00
spencerrlongg 8962ced038 push to switch branches 2024-03-13 10:40:50 -05:00
spencerrlongg 04d7884af8 some more testing stuff 2024-03-12 23:17:40 -05:00
spencerrlongg 6732b6601e some cool progress, but something with unique not working 2024-03-12 18:33:59 -05:00
Marcus Moore 0fcf223960
Add minimal validation for asset_tags 2024-03-12 12:00:10 -07:00
snipe 3f5cc2507d Used updated_at instead 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:39:49 +00:00
snipe 5a85424295 Added created_at to license pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 16:33:04 +00:00
snipe a289dfaf88 Cleanup 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 14:33:53 +00:00
snipe cde5502f94 Handle blank labels on asset label fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-10 14:03:21 +00:00
spencerrlongg eb8f1dd553 some cleanup 2024-03-09 12:29:26 -06:00
spencerrlongg c8341d9dc4 aha, got it working. 2024-03-08 19:48:47 -06:00
spencerrlongg b239b3a4db some good progress, lots of testing needs to be done on the new inclusion of SubstituteBindings 2024-03-08 18:24:41 -06:00
snipe 37dfecf098 Fixed uninitialized offset in labels 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 16:46:56 +00:00
Brady Wetherington a2e70dd6b2 Fix [sc-25008] - correct and improve legacy language warnings 
The legacy language warning was misfiring when a user's language
didn't match the APP_LOCALE from .env.

Additionally, we weren't properly warning when the legacy-language
came from Settings or from the user themselves. Both of which should
be impossible but still probably not a bad idea to warn on it, anyways
 2024-03-08 14:04:21 +00:00
snipe 112ddaf55b
Merge pull request #14394 from marcusmoore/fixes/check-endpoint-is-set-for-checkout-in-notifications 
Ensure Chat and Teams endpoints are not blank before attempting to send webhook on checkout and check in
 2024-03-08 08:44:52 +00:00
Marcus Moore 4b0bfc52b4
Ensure webhook endpoint is set before attempting to send to google or microsoft 2024-03-07 18:10:10 -08:00
snipe e8be178ac7
Merge pull request #14393 from marcusmoore/bug/sc-24862 
Guard against checking require acceptance on non-existent relationship in accessory model
 2024-03-08 01:04:26 +00:00
Marcus Moore 695428cd44
Guard against unrelated category 2024-03-07 16:59:01 -08:00
snipe 5cf10cec34 Remloved unneeded validation message 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 23:40:30 +00:00
snipe 7939c691f7 Added Brother 18mm label type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 22:04:12 +00:00
snipe c66267a0f9
Merge pull request #14389 from Godmartinz/remove-pdf-for-old-labels 
old engine works as intended
 2024-03-07 21:06:57 +00:00
Godfrey M d83974e07f old engine works as intended 2024-03-07 13:03:10 -08:00
Marcus Moore f270f30728
Redirect if no assets are returned from query 2024-03-07 12:30:08 -08:00
snipe d64ee42ec3 Wrapped in a transaction 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 15:04:08 +00:00
snipe fe08f39900 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 14:43:06 +00:00
snipe 5123ab57c9 Added console command to encrypt previously unencrypted fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 14:40:52 +00:00
snipe 4b13fa45c5
Merge pull request #14320 from Godmartinz/default_label_bug 
Default label setup with custom fields
 2024-03-07 10:33:43 +00:00
snipe 4231058aa1
Merge pull request #14371 from Godmartinz/RB17900_notification_bug 
Adds User email check when sending Asset acceptance reminder
 2024-03-07 10:18:19 +00:00
Godfrey M ff7d25c0f2 simplified 1dbarcode logic 2024-03-06 15:30:53 -08:00
Godfrey M 5f0b7f328c if statement order change 2024-03-06 15:24:03 -08:00
Godfrey M 6559581bad conditions 1dbarcode to populate based on settings 2024-03-06 15:10:42 -08:00
Godfrey M d78262f52b resolved merge conflicts 2024-03-06 14:48:47 -08:00
snipe a85e2f7aad
Merge pull request #14372 from snipe/bug/sc-24158 
Added route parameter
 2024-03-06 19:45:33 +00:00
Godfrey M c9d54baa10 bulk actions are handled before sorting 2024-03-05 15:47:52 -08:00
Godfrey M 940f54dab1 revert some changes 2024-03-05 15:45:35 -08:00
Godfrey M d83827a44e bulk actions are handled before sorting 2024-03-05 15:43:41 -08:00
snipe 23f8e35716 Added route parameter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-05 20:39:56 +00:00
Brady Wetherington 5b9120ba6c Merge branch 'develop' into snipeit_v7_laravel10 2024-03-05 19:22:37 +00:00
Godfrey M 6c3a668400 checks to see if a user has an email before sending them a reminder email. 2024-03-05 10:30:24 -08:00
spencerrlongg ad0f873ece rm validation stuff 2024-03-05 11:58:00 -06:00
spencerrlongg eac01868ca not all working, but pushing to work on something else 2024-03-05 11:02:55 -06:00
Godfrey M 95ef3a336b Merge branch 'develop' into default_label_bug 2024-03-04 12:03:54 -08:00
Godfrey M e926db76a0 fixes inconsistencies with generating labels 2024-03-04 10:26:38 -08:00
snipe 19e0fb7955 Reverting CSP change 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 12:25:14 +00:00
snipe 93e69ab0c6 Removed unsafe-inline and unsafe-eval 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:44:49 +00:00
snipe aaae952acb Use SVG cleaner on favicons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 10:17:57 +00:00
akemidx eb0657c953
Merge branch 'develop' into bug/sc-24812 2024-02-28 17:22:16 -05:00
snipe 7c3d8b896b Updated asset transformers/presenters to display requestable status 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 14:59:55 +00:00
snipe a4941031cb
Merge pull request #14260 from marcusmoore/chore/sc-24808 
Added tests around asset check in and added missing actions to the api controller action
 2024-02-28 13:34:12 +00:00
snipe 9fd6aea325
Merge pull request #14281 from Godmartinz/preview-label-fields 
Added better label previews with the new label engine
 2024-02-28 11:48:05 +00:00
snipe a52181c995
Merge pull request #14283 from akemidx/bug/sc-24788 
FIXED: Checked in Assets Did Not Show in Custom Report when Selecting a Valid Checked Out Date
 2024-02-28 11:47:46 +00:00
snipe ee75df0f0a
Merge pull request #14346 from snipe/feature/sc-18728 
Added `min_amt` functionality to licenses
 2024-02-28 11:26:25 +00:00
snipe a059a42799 Added use Auth to API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:14:48 +00:00
snipe 4ab7112988 Added validation and fillable attributes for min_amt 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:08:47 +00:00
snipe 4ffb7790df Added min_amt to API transformer/presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:07:18 +00:00
snipe 92b7c4b5ec Allow sorting on min_amt 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:05:13 +00:00
snipe dff7c43aed Added minimum account check for licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:05:02 +00:00
snipe 9efbcbbd5e Added min_amt to licenses 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:04:42 +00:00
snipe 31fa0a7044 Removed logging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 11:04:32 +00:00
snipe 0bd27d61b0 Added created_by to groups table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-28 08:15:59 +00:00
Marcus Moore 5084e5d3ef
Improve variable type 2024-02-27 12:23:26 -08:00
Marcus Moore a5516e3511
Improve trait name 2024-02-27 12:06:29 -08:00
Marcus Moore 0e460baf82
Improve readability 2024-02-27 12:03:36 -08:00
Godfrey M ef52777ffb removed conditional 2024-02-27 11:33:00 -08:00
Godfrey M b67ceab849 fields appear in preview, but not bulk generate labels 2024-02-27 11:29:19 -08:00
akemidx 5ffade663a unstash 2024-02-26 18:41:58 -05:00
spencerrlongg c025e25839 just the basics and notes, pushing to keep track 2024-02-26 14:32:50 -06:00
snipe a184b4e67c Nicer UI for history importer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-23 11:40:10 +00:00
Marcus Moore 4caadcfa19
Clear pending checkout acceptances when checking in asset via api 2024-02-22 13:33:16 -08:00
Marcus Moore dba837b1d2
Move location migration logic to trait 2024-02-22 13:21:52 -08:00
Marcus Moore 714fc63050
Have legacy locations updated upon api asset checkin 2024-02-22 13:14:30 -08:00
spencerrlongg b6fa6cba22 note before switching tasks 2024-02-22 15:01:14 -06:00
Marcus Moore 2df026bcb5
Allow updating asset default location when checking in asset via api 2024-02-22 12:40:14 -08:00
Godfrey M 6ee24a7527 remove unnecessary code reformat 2024-02-22 12:36:27 -08:00
Godfrey M e2dcee1959 cleans up dead code 2024-02-22 12:26:57 -08:00
Godfrey M 4fbea9512f puts textY inside of the forloop 2024-02-22 12:08:47 -08:00
Godfrey M b7850ab839 puts textY outside of the forloop 2024-02-22 12:08:04 -08:00
Godfrey M c0215baca5 minor changes 2024-02-22 11:41:04 -08:00
Godfrey M c62758c5b5 adds custom field select to default label view 2024-02-22 11:36:39 -08:00
spencerrlongg 14358651e4 pushing to test other branches 2024-02-22 13:28:23 -06:00
snipe f04aeb9f2b Fixed spacing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 18:31:02 +00:00
snipe dc902e7a5a Fixed return type 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 18:30:23 +00:00
snipe 4fc66e19bb Check for activeFile before trying to get header 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 18:28:01 +00:00
snipe cb78451d6c Made website searchable on users table 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 16:13:54 +00:00
snipe e8ad8a7448 Added email, phone icons 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 14:48:01 +00:00
snipe 3351998efd Only send notification if the item is assigned to a person 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-22 12:03:07 +00:00
spencerrlongg 20dbacd22f store good, update needs work 2024-02-21 21:33:34 -06:00
Marcus Moore aa2632fe46
Merge branch 'develop' into chore/sc-24808 2024-02-21 12:33:06 -08:00
Brady Wetherington 8f2843bfcf Merge branch 'develop' into snipeit_v7_laravel10 
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
 2024-02-21 20:22:28 +00:00
Godfrey M 14c86d447b added filter to collectifunction 2024-02-21 11:38:03 -08:00
Godfrey M bee016e0be keeps example values in the example preview, fixes indent 2024-02-21 09:31:01 -08:00
snipe 54552fc95c
Merge pull request #14192 from inietov/fixes/api_issue_checkin_licenses 
Fixed #14183  API /hardware/:id/checkin doesn't return Licenses
 2024-02-21 11:35:06 +00:00
akemidx 9397372f87 permissions, but they are now all in their own column because reasons??? 2024-02-20 18:48:17 -05:00
akemidx 8bbf6da052 user block, trying to pick out ONLY permissions we wanna see 2024-02-20 18:25:41 -05:00
snipe ffa7d25fc0
Merge pull request #14308 from snipe/fixes/eager_load_relations_on_locations 
Eager load relations to determine deletability on locations
 2024-02-20 22:28:39 +00:00
snipe 04891c7c61 Eager load relations to determine 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 22:25:00 +00:00
spencerrlongg d67ff54f4b temporary decrypt, almost there 2024-02-20 16:20:03 -06:00
Marcus Moore ccec190985
Set label title properly 2024-02-20 13:59:50 -08:00
spencerrlongg 26728a85ad this seems to work for patches 2024-02-20 13:18:40 -06:00
spencerrlongg c6d85a1b0b allows arrays on checkbox values 2024-02-20 12:23:24 -06:00
snipe 71610fb20f
Merge pull request #14304 from snipe/feature/sc-24018 
Added ability to bulk delete locations
 2024-02-20 18:14:51 +00:00
snipe 1797480128 Few more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:56 +00:00
snipe 972b198248 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 17:27:16 +00:00
snipe b2c8fbf349 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:42:04 +00:00
snipe c3f21d9292 Removed new checkbox selectability on users and assets - more complicated work to be done 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:41:58 +00:00
snipe 9b146ae1d2 Formatting for API response 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:51 +00:00
snipe a32c679519 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:31 +00:00
snipe 1e602793b2 Added manager ID to filter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:23 +00:00
snipe a6a65b7523 Fixed locations isDeletable check 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-20 16:40:09 +00:00
Brady Wetherington a6dfd67cd7 Clean up the file extension on image file uploads 2024-02-19 16:51:23 +00:00
snipe 30f9acfcf3 Disallow uploads in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 16:11:17 +00:00
snipe cb5b691ec1 Check that the model exists before trying to access properties 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 15:34:57 +00:00
snipe 8f8edd4126 Added /backups/latest endpoint 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 14:35:09 +00:00
snipe 10bb844087 Added comment 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 14:34:51 +00:00
snipe ba3baabb50 Fixed @return 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 14:34:36 +00:00
snipe c76fbe4edb Return 404 if download file isn’t found 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 13:05:44 +00:00
snipe 9847934de9 Better handle large downloads on backup API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-19 12:20:37 +00:00
snipe db73f80058 Starting off 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-16 18:57:50 +00:00
akemidx 4dd479dad7 formatting 2024-02-15 19:59:26 -05:00
akemidx d01e1e8eeb query works, but still only shows the asset once even if it's been checked out multiple times 2024-02-15 19:56:08 -05:00
akemidx e3ef737ac4 query first go 2024-02-15 19:15:27 -05:00
Godfrey M 69317fb403 Marcus is a beast and condensed everything into 4 lines 2024-02-15 13:26:47 -08:00
Godfrey M 1b80c8938a removed unnecessary if statement 2024-02-15 13:04:00 -08:00
Godfrey M dc77c01fd3 removes spacing 2024-02-15 13:00:38 -08:00
Godfrey M 83474d6e59 moves the array manipulation up the page where it should be 2024-02-15 12:59:47 -08:00
Godfrey M 529310c93a fixed typo in comment 2024-02-15 12:41:31 -08:00