3379 commits

Author	SHA1	Message	Date
Marcus Moore	5306e1cd15	Merge branch 'develop' into saving_custom_report_template ... # Conflicts: # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/reports/custom.blade.php	2024-10-15 12:32:01 -07:00
snipe	0ae9ce0aa9	Cannot sort by updated at on Users [sc-27147] ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-15 16:41:45 +01:00
snipe	50b8f180b3	More logical grouping in allow_columns ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-15 16:41:39 +01:00
Tobias Regnery	f3c4e55667	Refactor asset creation with API ... Commit fb4fe3004 restored the previous behaviour to check the company_id in case of FullMultipleCompanySupport. But after rereading the code and the laravel documentation, the check is already there where it belongs in AssetStoreRequest::prepareForValidation() The bug is the is_int-check of the request input in prepareForValidation(). Is is of type string even if it is a numeric value, so the call to getIdForCurrentUser() never happend. Fix this by removing the check and the now redundant call to getIdForCurrentUser(). Wrong values will get caught by the model-level validation rules.	2024-10-14 15:14:41 +02:00
snipe	e1a70023b1	Merge pull request #15655 from Toreg87/fixes/api_asset_create_fmcs ... Fixes #15654 Fix asset creation with API and FullMultipleCompanySupport	2024-10-11 11:45:48 +01:00
snipe	de62359c67	Merge pull request #15533 from marcusmoore/testing/fmcs-accessories ... Added tests for accessory api controller	2024-10-11 11:29:34 +01:00
Tobias Regnery	fb4fe30049	Fix asset creation with API and FullMultipleCompanySupport ... It is currently possible to create an asset with arbitrary company without being superuser and FullMultipleCompanySupport enabled. This bug goes back to 75ac7f80b9 which is part of version 6.3.0. Fix this by restoring the previous behaviour to check the company_id with getIdForCurrentUser().	2024-10-11 12:19:20 +02:00
snipe	8aa298f6b0	Merge pull request #15644 from snipe/form_requests_for_settings ... Form requests for settings	2024-10-10 12:30:53 +01:00
snipe	94a074a193	Merge pull request #15601 from snipe/check_db_on_healthcheck ... Fixed #15439 - check database on healthcheck	2024-10-10 01:11:10 +01:00
snipe	3886da8941	Remove form request from get LDAP method ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-09 22:15:49 +01:00
snipe	ded79469c1	Remove unused controller method ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-09 20:33:29 +01:00
snipe	aa55fa6ff4	Switch to form requests for settings ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-09 18:16:34 +01:00
snipe	7461c3e0ca	Change controller to assume a collection. (This is dumb, but whatever) ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-03 16:19:27 +01:00
Brady Wetherington	350b627ce1	Fix numeric sort 'ambiguous order clause' error	2024-10-03 14:23:40 +01:00
akemidx	e00a1aec02	note box is now missing when unchecking setting	2024-10-02 18:52:33 -04:00
akemidx	06e3bb7fd1	requested changes	2024-10-02 18:37:11 -04:00
akemidx	17706f150e	requested changes	2024-10-02 18:15:53 -04:00
akemidx	6fef127cd1	missing closing )	2024-10-02 18:15:53 -04:00
akemidx	f45b836010	backend form validation. +cleanup	2024-10-02 18:15:53 -04:00
akemidx	700647c53f	setting created	2024-10-02 18:15:52 -04:00
snipe	b34a7c8aad	Removed die() ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-02 15:48:35 +01:00
snipe	f92bf5dc20	Updated language for failure ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-02 15:39:27 +01:00
snipe	4d9e85026a	Fixed #15439 - check database on healthcheck ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-02 15:36:01 +01:00
spencerrlongg	8232618a9f	change the other one too	2024-10-01 14:26:32 -05:00
spencerrlongg	9a651b567d	change error to warning	2024-10-01 14:24:03 -05:00
spencerrlongg	1139acd9f3	catch errors around request notifications	2024-10-01 13:36:47 -05:00
snipe	27ba641aa5	Added checkin on delete to API ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-01 14:30:34 +01:00
snipe	5823197e6f	Added checkin action on delete for checked out assets ... Signed-off-by: snipe <snipe@snipe.net>	2024-10-01 14:29:02 +01:00
spencerrlongg	4f9f035c69	added a way to manipulate validator attribute names	2024-09-30 20:09:00 -05:00
Marcus Moore	fdfea390fb	Merge branch 'develop' into testing/fmcs-accessories	2024-09-30 12:59:27 -07:00
Marcus Moore	2004e58b53	Merge branch 'develop' into updated_ad_hoc_notes	2024-09-26 12:29:28 -07:00
Marcus Moore	eb2d7b1f4f	Move comment location	2024-09-26 12:14:00 -07:00
Marcus Moore	47763d1e1a	Add tests for adding notes to assets	2024-09-26 12:13:36 -07:00
Godfrey M	44447b85c9	Merge branch 'develop' into barcode_settings_hide	2024-09-26 11:27:05 -07:00
Godfrey M	3f74ff25d2	fixed error message	2024-09-25 16:19:09 -07:00
akemidx	b813dcd9d0	requested changes from github	2024-09-25 18:54:30 -04:00
spencerrlongg	b69596a261	rm dump	2024-09-25 16:21:33 -05:00
spencerrlongg	d02b9933e5	rm comment	2024-09-25 15:38:40 -05:00
snipe	3f0245f88f	Make controller gate match dropdown gate ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-25 20:33:00 +01:00
snipe	f6d7ea19e4	Set view as base permission, drill down for more intrusive actions ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-25 19:44:39 +01:00
snipe	9b03f46490	Merge pull request #15534 from marcusmoore/bulk-print-users ... Added the ability to bulk print users	2024-09-25 19:32:01 +01:00
spencerrlongg	f3ad89931f	hm ok this kind of works	2024-09-25 13:00:35 -05:00
spencerrlongg	21906d8c27	world set up and idea in place	2024-09-25 12:47:56 -05:00
snipe	658c94ad8b	Changed action_date to created_at ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-25 17:25:15 +01:00
snipe	1c3babacaf	Fixed case on logAction for usewr file upload ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-25 15:46:57 +01:00
snipe	0ce5832b6c	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-24 17:29:40 +01:00
Brady Wetherington	b6340532d7	Improve the error and success messages and linking	2024-09-24 17:15:39 +01:00
snipe	5fb43dd159	Handle audit *and* audits for urls ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-24 16:55:56 +01:00
snipe	de57d71bf1	Fixed #15548 - unify audit due/overdue APIs ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-24 16:30:24 +01:00
Brady Wetherington	c71411465a	First pass at better-handling those annoying Rollbars we keep getting	2024-09-24 15:17:35 +01:00
Marcus Moore	4b02db5031	Add authorization check in bulk users controller	2024-09-23 16:26:22 -07:00
Marcus Moore	ab90c0cf05	Add missing eager load in bulk users controller	2024-09-23 16:10:40 -07:00
Marcus Moore	cef7ddc719	Add eager loads to userscontroller	2024-09-23 16:10:21 -07:00
Marcus Moore	a2d4dcf6e8	Use bulk actions menu	2024-09-23 12:49:36 -07:00
Marcus Moore	54044bfa5e	Add eager loads	2024-09-23 10:57:57 -07:00
Marcus Moore	29af210f4f	Merge branch 'develop' into bulk-print-users	2024-09-23 10:26:20 -07:00
snipe	b68805cf83	Small fix for notifications checkout ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-20 19:11:52 +01:00
snipe	2fc88a0e08	Eager load adminuser ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-20 14:33:26 +01:00
snipe	bc540b6564	Requestable status not saving with manual [sc-26848] ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-20 14:02:28 +01:00
snipe	b21c303e56	Merge remote-tracking branch 'origin/develop' into features/add_created_at_created_by	2024-09-20 13:43:50 +01:00
Marcus Moore	5128fd49e6	Allow printing all users	2024-09-19 17:27:25 -07:00
Marcus Moore	2d2d5bdc7e	Pass user in array	2024-09-19 17:23:47 -07:00
Marcus Moore	e95703cb18	Use eager load	2024-09-19 17:10:07 -07:00
Marcus Moore	7ad4a29970	Add eager loading	2024-09-19 16:54:39 -07:00
snipe	cdb7ccb8f3	Merge pull request #15532 from spencerrlongg/bug/15253 ... Catch Exceptions on Checkout Notification	2024-09-19 21:54:03 +01:00
snipe	8270947ed2	Merge pull request #13291 from akemidx/eol_date_range_for_reports ... Added date range for EOL in custom reports	2024-09-19 21:49:27 +01:00
snipe	4f7c8e0c3d	Merge pull request #14671 from Robert-Azelis/patch-6 ... [FIX] Update EOL date when used bulk update of purchase date	2024-09-19 21:36:09 +01:00
Marcus Moore	d609ed50a4	Merge branch 'develop' into testing/fmcs-accessories	2024-09-19 13:20:55 -07:00
snipe	b88f2054dd	Refactor isDeletable on companies ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 20:38:34 +01:00
snipe	d7914e238d	Added created by to company on save ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 20:34:54 +01:00
snipe	454796e52a	Merge pull request #15518 from snipe/sort_by_numeric_custom_fields ... Fixed #11634 - Sort by numeric columns for numeric custom fields	2024-09-19 20:32:03 +01:00
spencerrlongg	d446773fdd	catch exceptions on notification	2024-09-19 14:05:48 -05:00
snipe	f283b5fbe8	Eager load adminuser ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 19:56:39 +01:00
snipe	eb6f05faf7	Eager load adminuser ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 19:41:46 +01:00
Marcus Moore	2137890496	Remove dead code	2024-09-19 11:33:20 -07:00
snipe	cd98b3817d	Removed duplicate line ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 18:26:08 +01:00
snipe	727806372c	Added created_by to status label ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 18:22:11 +01:00
snipe	5e1c736d49	Added created_by for manufacturers ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 18:04:50 +01:00
snipe	6579fa72da	Added scoping for categories and companies ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:56:05 +01:00
snipe	82d6e1510f	Order by created_by for depreciations ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:41:05 +01:00
snipe	822ea96dfd	Use auth()->id() instead of Auth::id() ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:31:46 +01:00
snipe	b247fc33b9	Added legacy comment ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:28:01 +01:00
snipe	2dcae780c0	Reapply deleted code ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:26:21 +01:00
snipe	5c3180ffa0	Removed duplicate code ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:25:09 +01:00
snipe	bbce7b40ca	Additional consistencies ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:20:56 +01:00
snipe	02a29c71ef	Added created_by ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:01:48 +01:00
snipe	6699995972	Added created_by to components ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:01:36 +01:00
snipe	951f03094a	Added created_by to kits ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 17:01:17 +01:00
snipe	c93229179b	Added order by created_by to accessories ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 16:45:39 +01:00
snipe	a77a7065d7	Added order by admin to assets ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 16:34:10 +01:00
snipe	9adb2c24f3	Squashed commit of the following: ... commit dddbf27d78 Author: snipe <snipe@snipe.net> Date: Wed Sep 18 14:18:52 2024 +0100 Updated language strings Signed-off-by: snipe <snipe@snipe.net> commit fcefcc8184 Merge: 04bb3eec8 3519a82dd Author: snipe <snipe@snipe.net> Date: Wed Sep 18 13:44:44 2024 +0100 Merge pull request #15512 from marcusmoore/testing/fmcs Added tests for delete methods in api commit 04bb3eec83 Merge: 154d5d8d9 f963b9a19 Author: snipe <snipe@snipe.net> Date: Wed Sep 18 13:41:37 2024 +0100 Merge pull request #15521 from uberbrady/improve_country_selector Fix selected-index of Countries drop-down [fd-44144] commit f963b9a19f Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Sep 18 13:24:26 2024 +0100 Fix selected-index of Countries drop-down commit 154d5d8d91 Merge: 6c996b775 9e5f6d656 Author: snipe <snipe@snipe.net> Date: Tue Sep 17 23:40:25 2024 +0100 Merge pull request #15491 from uberbrady/numeric_prefixes_add_multiple_assets [Fixes fd-43940] Improve multi-asset create when using numeric prefixes to asset_tags commit 3519a82ddd Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 16:55:20 2024 -0700 Fix name: TestsFullMultipleCompaniesSupport commit a629df07bf Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:49:08 2024 -0700 Implement interfaces on existing test classes commit 9a13fcab23 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:38:38 2024 -0700 Pluralize commit f5705a1dde Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:34:55 2024 -0700 More unification commit f325c4afdb Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:32:38 2024 -0700 Unify assertion method commit 1fddacd7d0 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:25:11 2024 -0700 Re-order test methods commit 4af893df61 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 14:20:24 2024 -0700 Improve assertions commit b8b3f91ce4 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:55:18 2024 -0700 Formatting commit 7f40f55343 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:52:02 2024 -0700 Add tests for delete supplier endpoint commit b06e8d442d Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:37:08 2024 -0700 Add tests for delete status label endpoint commit c269184c60 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:29:41 2024 -0700 Add tests for delete predefined kit endpoint commit 53c673dee2 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 13:13:12 2024 -0700 Add tests for delete manufacturer endpoint commit 50730fc4fb Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 12:37:18 2024 -0700 Add tests for delete location endpoint commit 60a54cee79 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 12:33:30 2024 -0700 Add tests for delete license endpoint commit 446e962a50 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:38:51 2024 -0700 Add tests for delete group endpoint commit 79a4bb7316 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:35:44 2024 -0700 Add tests for delete depreciation endpoint commit 2f76c1bc5b Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:33:21 2024 -0700 Add assertion commit 38b9f4a438 Author: Marcus Moore <contact@marcusmoore.io> Date: Mon Sep 16 10:29:20 2024 -0700 Add tests for delete departments endpoint commit 3105f53aff Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:54:29 2024 -0700 Add tests for delete custom fieldsets endpoint commit 2047cfed09 Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:20:32 2024 -0700 Add tests for delete custom fields endpoint commit e3268d32df Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 16:00:02 2024 -0700 Add tests for delete consumable endpoint commit 6df8b0ac0e Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 15:52:07 2024 -0700 Add tests for delete component endpoint commit 910f13c1f7 Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 15:38:30 2024 -0700 Add tests for delete companies endpoint commit 8ce2512f55 Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:54:44 2024 -0700 Add tests for delete category endpoint commit 0ec415d4d0 Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:46:22 2024 -0700 Clean up commit 2044570e95 Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:39:36 2024 -0700 Add tests for delete asset model endpoint commit b336c6273d Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:32:42 2024 -0700 Pluralize test classes commit 5299b3e9f0 Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:29:44 2024 -0700 Remove code handled by CompanyableChildTrait commit 872b76b45f Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:29:10 2024 -0700 Add tests for delete asset maintenance endpoint commit 275cf4630e Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:16:37 2024 -0700 Add tests for delete asset endpoint commit 5c2660bd34 Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 13:02:32 2024 -0700 Introduce interface commit c7ae9d9dfa Author: Marcus Moore <contact@marcusmoore.io> Date: Thu Sep 12 12:58:47 2024 -0700 Add tests for delete accessory endpoint commit 9e5f6d656a Author: Brady Wetherington <bwetherington@grokability.com> Date: Wed Sep 11 15:45:01 2024 +0100 Improve multi-asset create when using numeric prefixes to asset_tags Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 16:06:36 +01:00
snipe	634a4afa75	Fixed 1001 query on license ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-19 16:04:54 +01:00
Marcus Moore	636c776620	Remove dead code	2024-09-18 11:27:37 -07:00
Marcus Moore	c021609c13	Merge branch 'develop' into testing/fmcs-accessories	2024-09-18 10:42:58 -07:00
snipe	fcefcc8184	Merge pull request #15512 from marcusmoore/testing/fmcs ... Added tests for delete methods in api	2024-09-18 13:44:44 +01:00
Godfrey M	fa5651f335	remove getbarcodes, postbarcodes, barcodes settings blade	2024-09-17 16:21:26 -07:00
Godfrey M	b33c0fc4dd	updates getbarcode method and labels view	2024-09-17 16:15:56 -07:00
Marcus Moore	8bba11e1bb	Merge branch 'develop' into saving_custom_report_template ... # Conflicts: # app/Http/Controllers/ReportsController.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/status-select.blade.php # resources/views/reports/custom.blade.php	2024-09-17 15:26:35 -07:00
snipe	1582d81e5b	Change user_id to created_by ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-17 22:16:41 +01:00
Godfrey M	033a56fe6d	change variables in hardware labels edit post methods	2024-09-17 12:22:05 -07:00
snipe	7c85ad54eb	Sort by numeric columns for numeric custom fields ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-17 19:44:03 +01:00
Godfrey M	3682d9fa6c	removed duplicate line from post labels	2024-09-17 11:23:59 -07:00
Godfrey M	ce987b4f6d	added front end barcodes to labels	2024-09-17 11:23:38 -07:00
Marcus Moore	eb35608bb5	Remove call handled by form request	2024-09-16 16:35:33 -07:00
akemidx	74efd850af	redoing branch. old branch merge onflicts were waaay too gnarly	2024-09-16 19:30:26 -04:00
Marcus Moore	60a54cee79	Add tests for delete license endpoint	2024-09-16 12:33:30 -07:00
snipe	4debaaea39	Fixed #15504 - allow nulling/not changing locale in user bulk edit ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-16 14:31:10 +01:00
Marcus Moore	5299b3e9f0	Remove code handled by CompanyableChildTrait	2024-09-12 13:29:44 -07:00
snipe	a97530367d	Fixed tests again ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-11 17:29:22 +01:00
snipe	43250ae881	Updated tests ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-11 17:04:09 +01:00
snipe	98323185de	Null and warn if editing asset to a non-deployabe state ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-11 16:43:33 +01:00
Marcus Moore	dc6a5bf998	Reflash session so login message is displayed	2024-09-09 14:54:19 -07:00
snipe	c5dbc5f6b8	Correctly save user’s city on bulk edit ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-09 10:01:07 +01:00
snipe	7d9a0eba04	Added ability to sort on qty and remaining for consumables ... Signed-off-by: snipe <snipe@snipe.net>	2024-09-09 03:49:58 +01:00
snipe	12fa505972	Disabmiguate licenses company_id ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 21:07:30 +01:00
snipe	c197644ba7	Merge pull request #15284 from spencerrlongg/bug/sc-26584 ... [Multi-Company] Fixes Users Being Moved With Items Still Assigned	2024-08-29 11:38:15 +01:00
snipe	b06c527767	Check that the user exists before trying to print ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-29 11:06:30 +01:00
snipe	94c981e22c	Set image to null if model is deleted ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 14:23:49 +01:00
snipe	c6ddc501c5	Filter by depreciation_id ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:40:12 +01:00
snipe	4839181beb	Added counts to API ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:40:01 +01:00
snipe	63a05c89a7	Added counts to show method ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-28 12:39:52 +01:00
snipe	22bc088f6f	Added start_date and end_date to user bulk edit ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-27 07:21:19 +01:00
Marcus Moore	d67975cb62	Implement fix	2024-08-22 10:18:23 -07:00
snipe	56e31d2303	Fixed #15366 - use permission for encrypted custom fields ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-22 14:58:09 +01:00
snipe	ec0b9b198f	Merge pull request #15296 from uberbrady/expose_restore_sanitize ... Expose the 'sanitize' system for backup restores to the web GUI	2024-08-22 12:43:07 +01:00
r-xyz	cd7db5c4a8	Fix some typos in models file handler.	2024-08-21 22:24:08 +02:00
r-xyz	4ec361c718	Add AssetModel files endpoints to API	2024-08-21 19:49:51 +02:00
spencerrlongg	a8cd1027f3	rm commented code	2024-08-20 11:40:15 -05:00
akemidx	8e1111c681	Merge remote-tracking branch 'upstream/develop' into eol_date_range_for_reports	2024-08-19 19:33:44 -04:00
snipe	84f14a05bd	Fixed logging for asset model restore ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 13:20:19 +01:00
snipe	229d8b9bf5	Added location restore ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-19 13:19:59 +01:00
snipe	4253acad4c	Prevent passing an array as login ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-18 04:51:36 +01:00
snipe	856c57cb12	Corrected some translations ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-16 12:39:59 +01:00
snipe	de29c1d8a0	Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days ... Added #15312: Add checkin due in days setting	2024-08-16 10:21:36 +01:00
snipe	4356cb7b9b	Added confetti option ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 11:32:42 +01:00
Glukose1	d8df52cc8f	Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field.	2024-08-15 12:20:51 +02:00
snipe	d8038ac483	Removed status label list ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 10:17:08 +01:00
snipe	01c69c8f8f	Allow optional status label on quickscan checkin ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-15 10:08:48 +01:00
spencerrlongg	f031309f8f	set up api controller for route/model binding	2024-08-14 16:09:15 -05:00
spencerrlongg	20ec420ba3	not quite done, api side needs some work	2024-08-14 13:53:29 -05:00
spencerrlongg	a70b94e707	Merge branch 'refs/heads/develop' into bug/sc-26584	2024-08-14 11:36:19 -05:00
Brady Wetherington	cc5ad456e6	Expose the 'sanitize' system for backup restores to the web GUI	2024-08-14 15:59:21 +01:00
snipe	371afde52d	Bulk edit asset name ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-14 09:52:25 +01:00
spencerrlongg	120cfd13c5	translation	2024-08-13 14:07:40 -05:00
spencerrlongg	09f2739298	works, un-reassignable licenses are an issue	2024-08-13 13:45:41 -05:00
snipe	e9fc455a30	Merge pull request #15192 from Godmartinz/status_labels_check_emails ... Added status labels to confirmation emails	2024-08-13 18:24:15 +01:00
Brady Wetherington	4b96721393	Attempt to de-escalate SAML login and logout errors	2024-08-13 14:55:13 +01:00
spencerrlongg	ec863df007	rm conditional that might be unnecessary	2024-08-12 16:58:53 -05:00
spencerrlongg	cc3b8e0681	this should more or less work, but i need to determine if this is the best way	2024-08-12 16:58:21 -05:00
spencerrlongg	ff145abbe7	use array for eager loading, makes ide prettier	2024-08-12 16:13:03 -05:00
snipe	ac1543d568	Fixed #15247 - make pie chart on dashboard respect the “show archived” setting ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-12 17:54:42 +01:00
snipe	ce5be8ac24	Merge pull request #15100 from Godmartinz/depreciation_percentage ... Added Depreciation Percentage as an option	2024-08-12 10:10:25 +01:00
snipe	a1ce9b9285	Added query scope for ordering by admin ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-10 17:00:50 +01:00
snipe	f76fbe75e0	Merge pull request #15221 from marcusmoore/fixes/bulk-checkin-logging ... Fixed accessories and consumables not being logged correctly during bulk check-in	2024-08-08 10:43:59 +01:00
Marcus Moore	d03baa4613	Make diff cleaner	2024-08-07 13:29:45 -07:00
Marcus Moore	41437e4d8f	Merge branch 'develop' into fixes/bulk-checkin-logging ... # Conflicts: # app/Http/Controllers/Users/BulkUsersController.php	2024-08-07 13:06:59 -07:00
snipe	7d220dd8c2	set default ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:58:04 +01:00
snipe	a99ec062e6	Added checkbox for preferences ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:49:07 +01:00
snipe	9350a20189	Include accessories count ... This isn’t exactly right right now Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:19:47 +01:00
snipe	889d5da71e	Check for accessories on bulk items ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 20:04:32 +01:00
snipe	5546ab08c2	Only delete user records in accessories_checkouts for bulk delete ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 19:53:18 +01:00
snipe	ef183f256c	Merge pull request #15242 from Godmartinz/shortcut_option ... Fixed shortcuts to be optional now	2024-08-07 18:56:27 +01:00
Godfrey M	6b1784f2ee	makes shortcuts optional	2024-08-07 10:47:16 -07:00
snipe	a5f075548a	Default to user ... Signed-off-by: snipe <snipe@snipe.net>	2024-08-07 18:04:39 +01:00
Marcus Moore	c7ddabcc8b	Check for FMCS when checking out component	2024-08-06 12:27:15 -07:00
Marcus Moore	f2b78d18a4	Merge branch 'develop' into fixes/bulk-checkin-logging ... # Conflicts: # app/Http/Controllers/Users/BulkUsersController.php	2024-08-05 17:25:54 -07:00
Marcus Moore	17eccfcd8b	Formatting	2024-08-05 16:58:27 -07:00
Marcus Moore	01e4382d20	Formatting	2024-08-05 16:58:17 -07:00
Marcus Moore	1c664af326	Remove todo outside of scope	2024-08-05 16:58:08 -07:00
Marcus Moore	392d34422a	Remove code handled by ConsumableAssignment:: call above	2024-08-05 16:57:40 -07:00
Marcus Moore	67b3ab820f	Add todo comments	2024-08-05 16:10:08 -07:00
Marcus Moore	bfebcdc7ed	Improve variable name	2024-08-05 15:22:35 -07:00
Florent Bervas	ad794248fe	add a warning message if asset tag not found	2024-08-05 13:54:33 +00:00
Florent Bervas	b804791ff6	feature: extend search capabilities to other assets attributes	2024-08-05 12:26:29 +00:00
Godfrey M	854903805b	one more spot	2024-07-31 12:16:41 -07:00
Godfrey M	b6cac4baae	corrects ? usage	2024-07-31 12:03:36 -07:00
spencerrlongg	437ddc01b4	removed extraneous $request->validate() arguments	2024-07-30 16:26:24 -05:00
arne-kroeger	e8d0147075	Adjusted missing down on migration and code smells	2024-07-29 19:04:10 +02:00
arne-kroeger	b18baf74d2	added options to checkout accessoires to locations and assets ... Added #14979: add checkout functionality to accessoires	2024-07-29 10:54:53 +02:00
snipe	aab29fbb6b	Use translated string for restore ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-26 16:47:40 +01:00
snipe	e4a82edd3f	Merge pull request #15172 from snipe/features/blade_component_for_submit ... Use blade component for submit redirect on asset edit/create	2024-07-26 15:13:30 +01:00
snipe	ff100c0b9f	Added more tests ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-26 14:58:10 +01:00
snipe	037cc4d098	More tests ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-26 14:27:07 +01:00
snipe	cd7f276c40	Fixed logging for component ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-26 13:09:21 +01:00
snipe	5d7f1f77a3	Added redirect to checkin/checkout controllers ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-26 12:48:07 +01:00
snipe	759ab78f80	Added more redirects ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-26 11:27:36 +01:00
snipe	b6d9f736e3	Pulled use session ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-26 10:41:28 +01:00
snipe	57f6ecb1da	Added created_by to license view ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-26 10:24:13 +01:00
snipe	08f4fe5f35	Add status messages to redirect ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-25 22:02:34 +01:00
snipe	73a80a5fbc	Use blade component for redirect option ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-25 21:35:13 +01:00
Marcus Moore	44dbbeb608	Add accessory and consumable specific checkin methods	2024-07-24 14:17:49 -07:00
snipe	c3a2cdeee9	Added assets endpoint for locations ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-24 20:53:58 +01:00
Godfrey Martinez	c96ccbb6cb	Merge branch 'develop' into depreciation_percentage	2024-07-24 12:12:28 -07:00
Godfrey M	d5c9fa823e	adds translations	2024-07-24 11:39:33 -07:00
Godfrey M	99741db645	adds status labels to confirmation emails	2024-07-24 11:24:30 -07:00
snipe	293abbd1d0	Allow cloning of deleted assets ... Signed-off-by: snipe <snipe@snipe.net>	2024-07-24 17:49:38 +01:00
snipe	effd273245	Merge pull request #14458 from spencerrlongg/bug/sc-24884 ... Add Form Request and Tests for Update Asset API Method	2024-07-23 20:57:47 +01:00
Brady Wetherington	d893de2b7e	Merge branch 'develop' into fix_setup_ssl_check	2024-07-23 20:24:38 +01:00
Brady Wetherington	7f7cfef81b	Mark test as Incomplete, and downgrade error back to debug for tests	2024-07-23 20:24:05 +01:00
spencerrlongg	1139ed676a	$id to $asset->id (thanks tests)	2024-07-23 13:03:25 -05:00