359 commits

Author	SHA1	Message	Date
spencerrlongg	6732b6601e	some cool progress, but something with unique not working	2024-03-12 18:33:59 -05:00
snipe	03df4cec45	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2024-02-14 09:46:43 +00:00
Spencer Long	8546407083	Merge branch 'develop' into refactor/store_asset_form_request	2024-01-02 18:05:15 -06:00
spencerrlongg	68d85385a2	get rid of physical	2023-11-30 16:03:30 -06:00
spencerrlongg	88b6a541ee	removed references to archived	2023-11-30 15:59:03 -06:00
spencerrlongg	133c469e36	organization	2023-11-30 14:25:58 -06:00
spencerrlongg	7e780c1187	cleanup rules formatting	2023-11-30 12:20:02 -06:00
spencerrlongg	df954a3af2	return types	2023-11-30 12:06:58 -06:00
spencerrlongg	135b7bde7d	added some more check out assertions	2023-11-30 11:53:26 -06:00
snipe	3152df2c48	Created mutator for requestable attribute ... Signed-off-by: snipe <snipe@snipe.net>	2023-11-29 10:07:47 +00:00
spencerrlongg	c886fb555b	checkout on store tests almost done	2023-11-28 22:11:20 -06:00
spencerrlongg	cba5f869c0	standardize some of the validation rules, fix int/string issue	2023-11-28 21:19:19 -06:00
spencerrlongg	4aae82fa38	cleanup validation rules a little	2023-11-28 17:28:17 -06:00
spencerrlongg	75ac7f80b9	some refactor + tests	2023-11-28 15:17:46 -06:00
snipe	9d786d9386	Removed unused method ... Signed-off-by: snipe <snipe@snipe.net>	2023-11-28 13:43:33 +00:00
snipe	4723cfd4ba	More refactoring ... Signed-off-by: snipe <snipe@snipe.net>	2023-11-28 13:33:32 +00:00
snipe	4eb435e148	Use unique_undeleted instead of unique_serial ... Signed-off-by: snipe <snipe@snipe.net>	2023-11-21 12:36:11 +00:00
spencerrlongg	c7f90ad86d	tested, working	2023-11-15 12:50:40 -06:00
spencerrlongg	c9604b896a	nevermind	2023-11-01 13:46:32 -05:00
spencerrlongg	d167ec6dc0	unique undeleted recreated with laravel rule	2023-11-01 13:36:35 -05:00
spencerrlongg	d4b9f6a2a4	add not_array (not ready, doesn't catch for specific exception)	2023-10-31 21:00:22 -05:00
Ivan Nieto Vivanco	9f9f8c173b	Add condition to only run trough custom fields if a custom fieldset exist	2023-10-31 10:00:36 -06:00
snipe	d93e399295	Merge pull request #13797 from Godmartinz/employeeid_search_add ... adds employee number as a searchable field to the asset table	2023-10-25 21:04:54 +01:00
Godfrey M	1b614c13fb	ugh	2023-10-25 13:03:42 -07:00
Godfrey M	56fd41eee4	removed erroneous code	2023-10-25 13:03:12 -07:00
Godfrey M	33b45898b1	adds to advancedsearch	2023-10-25 12:59:58 -07:00
snipe	307f84dff8	Removed extraneous method ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-25 19:41:53 +01:00
snipe	08693f09b0	Added requests() method on Assets ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-25 17:22:12 +01:00
spencerrlongg	388e4c10c4	catch custom fields that are arrays	2023-10-17 19:03:58 -05:00
Ivan Nieto Vivanco	74ed32903f	Adds condition to check if parameter is of the proper type	2023-10-17 15:48:51 -06:00
snipe	93cccf4f5f	Handle case where value is deleted in history ... Signed-off-by: snipe <snipe@snipe.net>	2023-10-13 19:32:09 +01:00
spencerrlongg	c48a47936c	add validation back in	2023-09-20 14:00:59 -05:00
spencerrlongg	6b4f8f1813	rm duplicate fillable	2023-09-19 18:07:15 -05:00
spencerrlongg	929e107a20	rm byod from casts	2023-09-19 18:04:16 -05:00
spencerrlongg	7047869367	cleanup	2023-09-12 18:03:13 -05:00
spencerrlongg	fb001caee4	fix conflicts	2023-09-11 17:33:31 -05:00
slong753	75d7e3e1a0	fix conflicts	2023-09-11 17:20:21 -05:00
slong753	774f21bb7f	some more cleanup	2023-09-11 17:17:59 -05:00
slong753	20367eecc9	fix conflicts	2023-09-11 17:17:59 -05:00
slong753	c1daabef08	progress	2023-09-11 17:10:41 -05:00
snipe	d6dd332b09	Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog ... Added/Fixed: track changes on asset checkin/out	2023-09-05 19:08:49 +01:00
snipe	a62e2f092b	Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report ... Added last check in column and filter to custom asset report	2023-09-05 13:22:15 +01:00
Johnson Yi	09f7b3debe	Track changes on asset checkin/out	2023-09-01 13:12:07 +10:00
snipe	663faffcc1	Un-cast byod, validate as boolean ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-30 19:13:55 +01:00
Marcus Moore	489d30c685	Set last_checkin in ui and api controllers	2023-08-21 11:57:33 -07:00
Ivan Nieto Vivanco	b607a59875	Add query to search default locations in advanced search	2023-08-16 15:04:17 -06:00
snipe	540b09c506	Possible alternative to fixing #13296 - custom report failing when the model is busted ... Related: https://github.com/snipe/snipe-it/pull/13297 Signed-off-by: snipe <snipe@snipe.net>	2023-07-20 17:45:45 +01:00
Brady Wetherington	76191a09ed	Improvements to asset_tag auto-incrementing, with auto-fixups for gaps	2023-07-12 16:39:45 +01:00
snipe	bcefe73c9c	Use proper alias for table scope ... Signed-off-by: snipe <snipe@snipe.net>	2023-06-29 16:52:09 +01:00
snipe	4f7b2836b5	Set table alias for model number sort scope ... Signed-off-by: snipe <snipe@snipe.net>	2023-06-26 08:27:17 +01:00
Ivan Nieto Vivanco	f9a20bc917	Replace join with left join in pertinent eloquent query	2023-06-01 12:08:51 -06:00
ak-piracha	1cdf089306	Fixes: issue #13073: deleted component addearing in asset component tab fixed	2023-05-31 00:11:11 +09:30
Marcus Moore	0a3d46824e	Automatically add table prefixes when building multi-column search string	2023-05-23 15:58:58 -07:00
Marcus Moore	b2b6f0cf96	Use new dynamic scope where possible	2023-05-23 13:38:50 -07:00
Marcus Moore	64e83ed9f5	Update scopeAssignedSearch in Asset	2023-05-22 16:54:54 -07:00
Marcus Moore	2d86c8f030	Update advancedTextSearch methods in Asset and User models	2023-05-18 17:06:41 -07:00
Ivan Nieto Vivanco	fbb7c55450	Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models	2023-05-04 03:12:36 -06:00
Godfrey M	bd212b3108	adds component costs to asset view	2023-04-19 16:35:06 -07:00
slong753	8c1c0e81b6	rm deplicates	2023-03-30 13:31:58 -05:00
slong753	e126a75f7a	pretty sure this was it	2023-03-29 21:37:26 -05:00
snipe	ea54f540de	Dynamically determine target route for expected checkin emails ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 13:42:51 -08:00
snipe	1f7ae08d76	Merge branch 'develop' into features/make_eol_sortable	2023-02-28 18:05:09 -08:00
snipe	c7106a1df2	Added table aliases to fix ambiguous SQL clause ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-27 13:24:09 -08:00
snipe	5a1e5f740d	Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation ... Fixed #12531 Expected Checkin Date on Asset Checkout throws an error	2023-02-22 16:03:51 -08:00
Ivan Nieto Vivanco	6e994c209f	Adds setter to model Asset class for expected checkin	2023-02-19 12:31:10 -06:00
snipe	754842f620	FML - this is a hotfix and I don’t know why this is causing problems ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-16 16:58:00 -08:00
snipe	de4f7bd274	Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation ... Enforce Y-m-d as date format for date fields	2023-02-15 12:54:22 -08:00
snipe	25461caa2c	Removed date validation rule ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 12:53:55 -08:00
snipe	d52d32fed9	Fixed visibility for constants and methods ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-06 12:44:02 -08:00
snipe	9c79fc19cb	Tightened up and removed some validation that wasn’t needed ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 17:37:15 -08:00
snipe	fd2a057d38	Make audit dates fillable ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 17:36:58 -08:00
snipe	3c4f254583	Enforce Y-m-d as date format for date fields ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 13:38:53 -08:00
snipe	febfcd4803	Updated model with new field ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:56:19 -08:00
Marcus Moore	181f96ad33	Allow users to set a blank asset name during checkout	2023-01-19 12:35:44 -08:00
snipe	48b8cfcef9	Added byod to model, removed duplicate validation rule ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:04:36 -08:00
snipe	7fa9214beb	Merge pull request #11489 from Godmartinz/bug/sc-19333/expiring-assets-report-email-content-ordering ... Fixed the order expiring assets are listed in notifications	2022-08-29 12:37:01 -07:00
Godfrey M	ea63049b4b	removed redundancy with raw query	2022-08-29 12:33:51 -07:00
snipe	9cf5f30c77	Set safeMode to true and use helper for all parsedown ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-29 11:26:47 -07:00
Godfrey M	309229619b	fixes the order expiring assets are listed in notifications	2022-07-11 12:25:38 -07:00
snipe	daf6c72005	Fleshed out comments on new scope ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 16:02:54 -07:00
snipe	d45d322b54	Use scoped query for asset count ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 13:43:23 -07:00
Ivan Nieto Vivanco	e0b64a4879	Fixes constraint violation when ordering some columns	2022-05-24 14:00:23 -05:00
Godfrey M	33b1ab3658	prevents values for assets being negative through validation	2022-05-10 16:19:06 -07:00
snipe	a937bd34f6	Merge master back down into develop ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:28:43 +01:00
Ivan Nieto Vivanco	98b78837e1	Validate custom fieldset only if the asset have one	2022-03-22 09:38:57 -06:00
Ivan Nieto Vivanco	e104195796	Convert value of the customfield element from string to boolean	2022-03-09 18:49:39 -06:00
Ivan Nieto Vivanco	f36de6c670	Validates if model and model->category exist before return the checkin_email property	2022-02-10 13:53:49 -06:00
snipe	5fded57ec6	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/ProfileController.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Models/Asset.php # app/Models/License.php # app/Providers/AppServiceProvider.php # app/Services/LdapAd.php # config/version.php # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/lang/ar/button.php # resources/lang/de/admin/companies/general.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/groups/titles.php # resources/lang/de/admin/hardware/form.php # resources/lang/de/admin/hardware/general.php # resources/lang/de/admin/hardware/message.php # resources/lang/de/admin/hardware/table.php # resources/lang/de/admin/kits/general.php # resources/lang/de/admin/locations/table.php # resources/lang/de/admin/reports/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/de/admin/users/general.php # resources/lang/de/general.php # resources/lang/de/mail.php # resources/lang/en/admin/asset_maintenances/message.php # resources/lang/en/admin/asset_maintenances/table.php # resources/lang/en/admin/companies/general.php # resources/lang/en/admin/companies/message.php # resources/lang/en/admin/custom_fields/general.php # resources/lang/en/admin/depreciations/general.php # resources/lang/en/admin/groups/titles.php # resources/lang/en/admin/hardware/form.php # resources/lang/en/admin/hardware/general.php # resources/lang/en/admin/hardware/table.php # resources/lang/en/admin/kits/general.php # resources/lang/en/admin/locations/table.php # resources/lang/en/admin/reports/general.php # resources/lang/en/admin/settings/general.php # resources/lang/en/admin/settings/message.php # resources/lang/en/admin/users/general.php # resources/lang/en/button.php # resources/lang/en/general.php # resources/lang/en/help.php # resources/lang/en/mail.php # resources/lang/en/passwords.php # resources/lang/hu/admin/hardware/general.php # resources/lang/hu/admin/hardware/table.php # resources/lang/hu/admin/locations/table.php # resources/lang/is/admin/locations/table.php # resources/lang/ko/admin/custom_fields/general.php # resources/lang/ko/general.php # resources/lang/nl/admin/hardware/general.php # resources/lang/nl/admin/hardware/message.php # resources/lang/nl/admin/hardware/table.php # resources/lang/nl/admin/locations/table.php # resources/lang/nl/admin/statuslabels/message.php # resources/lang/nl/admin/users/general.php # resources/lang/no/admin/companies/general.php # resources/lang/no/admin/custom_fields/general.php # resources/lang/no/admin/depreciations/general.php # resources/lang/no/admin/depreciations/table.php # resources/lang/no/admin/groups/titles.php # resources/lang/no/admin/hardware/form.php # resources/lang/no/admin/hardware/general.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/locations/table.php # resources/lang/no/admin/reports/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/admin/settings/message.php # resources/lang/no/admin/statuslabels/message.php # resources/lang/no/admin/users/general.php # resources/lang/no/button.php # resources/lang/no/general.php # resources/lang/no/mail.php # resources/lang/no/validation.php # resources/lang/pl/admin/companies/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/pl/admin/depreciations/general.php # resources/lang/pl/admin/depreciations/table.php # resources/lang/pl/admin/groups/titles.php # resources/lang/pl/admin/hardware/form.php # resources/lang/pl/admin/hardware/general.php # resources/lang/pl/admin/hardware/table.php # resources/lang/pl/admin/kits/general.php # resources/lang/pl/admin/locations/table.php # resources/lang/pl/admin/reports/general.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/admin/settings/message.php # resources/lang/pl/admin/users/general.php # resources/lang/pl/button.php # resources/lang/pl/general.php # resources/lang/pt-PT/admin/companies/general.php # resources/lang/pt-PT/admin/custom_fields/general.php # resources/lang/pt-PT/admin/depreciations/general.php # resources/lang/pt-PT/admin/depreciations/table.php # resources/lang/pt-PT/admin/groups/titles.php # resources/lang/pt-PT/admin/hardware/form.php # resources/lang/pt-PT/admin/hardware/general.php # resources/lang/pt-PT/general.php # resources/lang/pt-PT/help.php # resources/lang/pt-PT/validation.php # resources/lang/ro/admin/companies/general.php # resources/lang/ro/admin/custom_fields/general.php # resources/lang/ro/admin/groups/titles.php # resources/lang/ro/admin/hardware/form.php # resources/lang/ro/admin/hardware/general.php # resources/lang/ro/admin/hardware/message.php # resources/lang/ro/admin/hardware/table.php # resources/lang/ro/admin/locations/table.php # resources/lang/ro/admin/settings/message.php # resources/lang/ru/admin/companies/general.php # resources/lang/ru/admin/custom_fields/general.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/general.php # resources/lang/ru/validation.php # resources/lang/sk/admin/settings/general.php # resources/lang/sk/button.php # resources/lang/sk/general.php # resources/lang/tr/admin/hardware/form.php # resources/lang/tr/admin/hardware/table.php # resources/lang/tr/admin/kits/general.php # resources/lang/tr/admin/locations/table.php # resources/lang/tr/admin/reports/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/admin/settings/message.php # resources/lang/tr/admin/statuslabels/message.php # resources/lang/tr/admin/users/general.php # resources/lang/tr/button.php # resources/lang/tr/general.php # resources/lang/zh-CN/admin/companies/general.php # resources/lang/zh-CN/admin/custom_fields/general.php # resources/lang/zh-CN/admin/depreciations/general.php # resources/lang/zh-CN/admin/depreciations/table.php # resources/lang/zh-CN/admin/groups/titles.php # resources/lang/zh-CN/admin/hardware/form.php # resources/lang/zh-CN/admin/hardware/general.php # resources/lang/zh-CN/admin/hardware/message.php # resources/lang/zh-CN/admin/hardware/table.php # resources/lang/zh-CN/admin/kits/general.php # resources/lang/zh-CN/admin/locations/table.php # resources/lang/zh-CN/admin/reports/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/admin/settings/message.php # resources/lang/zh-CN/admin/statuslabels/message.php # resources/lang/zh-CN/admin/users/general.php # resources/lang/zh-CN/button.php # resources/lang/zh-CN/general.php # resources/lang/zh-CN/mail.php # resources/views/depreciations/edit.blade.php	2022-02-01 18:53:05 -08:00
Ivan Nieto Vivanco	42d86bf57b	Adds default values if the expiring alerts threshold is null	2022-01-18 14:21:49 -06:00
Brady Wetherington	ef463a37d8	Make 'pending' assets properly requestable; use requestable scope	2022-01-14 12:48:33 -08:00
snipe	00b63fe7c7	Fixed category factory methods ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 13:40:16 -08:00
Terrell Eaton	2c7a71a2a1	Fixes not being able to search by checked out user in advanced search	2021-11-01 22:14:19 +01:00
snipe	371a39a118	Merge branch 'develop' into fixes/advanced_search_serial_v2	2021-10-28 16:42:10 -07:00
Ivan Nieto Vivanco	ee9133f722	Return the proper Asset-Components relationship	2021-10-27 16:42:51 -05:00
snipe	ae1a4bb3c9	Fixed extra braces from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:36:06 -07:00
snipe	aa8f1378c9	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Http/Controllers/Accessories/AccessoriesController.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Assets/BulkAssetsController.php # app/Http/Controllers/Components/ComponentsController.php # app/Http/Controllers/Consumables/ConsumablesController.php # app/Http/Controllers/Licenses/LicenseFilesController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/UserFilesController.php # app/Http/Transformers/AssetsTransformer.php # app/Http/Transformers/LicensesTransformer.php # app/Importer/UserImporter.php # app/Models/Asset.php # config/app.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/en/admin/users/message.php # resources/lang/is/button.php # resources/lang/ja/admin/kits/general.php # resources/lang/ro/admin/users/general.php # resources/lang/zh-HK/admin/depreciations/general.php # resources/lang/zh-HK/admin/models/general.php # resources/views/hardware/qr-view.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/users/view.blade.php # routes/web.php # routes/web/hardware.php # routes/web/models.php # routes/web/users.php	2021-10-20 17:26:41 -07:00
snipe	6e270c0ed2	Include created_at in pivot ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:23:17 -07:00
snipe	e27065fe16	Merge branch 'develop-v6-integration' into develop-v6-rc1 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/ResetDemoSettings.php # app/Helpers/Helper.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/ComponentsController.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/DepreciationsController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Requests/ImageUploadRequest.php # app/Http/Transformers/ActionlogsTransformer.php # app/Http/Transformers/DepreciationsTransformer.php # app/Listeners/CheckoutableListener.php # app/Models/Accessory.php # app/Models/Asset.php # app/Models/Company.php # app/Models/Ldap.php # app/Models/User.php # app/Presenters/AssetPresenter.php # app/Presenters/CategoryPresenter.php # composer.json # composer.lock # config/version.php # database/factories/AssetModelFactory.php # database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php # database/seeds/AssetModelSeeder.php # package-lock.json # 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/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-black.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-blue.min.css # public/css/dist/skins/skin-contrast.css # public/css/dist/skins/skin-contrast.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-green.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-orange.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-purple.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-red.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/css/dist/skins/skin-yellow.css # public/css/dist/skins/skin-yellow.min.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/js/vue.js # resources/lang/af/validation.php # resources/lang/ar/admin/settings/general.php # resources/lang/ar/validation.php # resources/lang/bg/admin/settings/general.php # resources/lang/bg/validation.php # resources/lang/cs/admin/settings/general.php # resources/lang/cs/validation.php # resources/lang/cy/help.php # resources/lang/cy/validation.php # resources/lang/da/admin/settings/general.php # resources/lang/da/validation.php # resources/lang/de/admin/settings/general.php # resources/lang/de/validation.php # resources/lang/el/validation.php # resources/lang/en-GB/admin/settings/general.php # resources/lang/en-GB/validation.php # resources/lang/en-ID/admin/hardware/table.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/validation.php # resources/lang/es-CO/admin/settings/general.php # resources/lang/es-CO/auth/message.php # resources/lang/es-CO/button.php # resources/lang/es-CO/help.php # resources/lang/es-CO/validation.php # resources/lang/es-ES/admin/settings/general.php # resources/lang/es-ES/auth/message.php # resources/lang/es-ES/button.php # resources/lang/es-ES/help.php # resources/lang/es-ES/validation.php # resources/lang/es-MX/admin/settings/general.php # resources/lang/es-MX/validation.php # resources/lang/es-VE/admin/settings/general.php # resources/lang/es-VE/auth/message.php # resources/lang/es-VE/button.php # resources/lang/es-VE/help.php # resources/lang/es-VE/validation.php # resources/lang/et/validation.php # resources/lang/fa/validation.php # resources/lang/fi/admin/settings/general.php # resources/lang/fi/validation.php # resources/lang/fil/validation.php # resources/lang/fr/admin/settings/general.php # resources/lang/fr/validation.php # resources/lang/ga-IE/validation.php # resources/lang/he/admin/settings/general.php # resources/lang/he/general.php # resources/lang/he/validation.php # resources/lang/hr/validation.php # resources/lang/hu/validation.php # resources/lang/id/validation.php # resources/lang/is/admin/categories/general.php # resources/lang/is/admin/companies/message.php # resources/lang/is/admin/companies/table.php # resources/lang/is/admin/components/general.php # resources/lang/is/admin/components/table.php # resources/lang/is/admin/consumables/table.php # resources/lang/is/admin/depreciations/general.php # resources/lang/is/admin/depreciations/message.php # resources/lang/is/admin/hardware/form.php # resources/lang/is/admin/hardware/general.php # resources/lang/is/admin/hardware/message.php # resources/lang/is/admin/hardware/table.php # resources/lang/is/admin/kits/general.php # resources/lang/is/admin/licenses/form.php # resources/lang/is/admin/licenses/general.php # resources/lang/is/admin/locations/table.php # resources/lang/is/admin/manufacturers/table.php # resources/lang/is/admin/reports/message.php # resources/lang/is/admin/settings/general.php # resources/lang/is/admin/settings/message.php # resources/lang/is/admin/statuslabels/message.php # resources/lang/is/admin/suppliers/message.php # resources/lang/is/admin/suppliers/table.php # resources/lang/is/admin/users/table.php # resources/lang/is/mail.php # resources/lang/is/validation.php # resources/lang/it/admin/settings/general.php # resources/lang/it/validation.php # resources/lang/iu/validation.php # resources/lang/ja/mail.php # resources/lang/ja/validation.php # resources/lang/ko/validation.php # resources/lang/lt/validation.php # resources/lang/lv/validation.php # resources/lang/mi/validation.php # resources/lang/mk/validation.php # resources/lang/ml-IN/validation.php # resources/lang/mn/validation.php # resources/lang/ms/validation.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/validation.php # resources/lang/no/validation.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/validation.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/mail.php # resources/lang/pt-BR/validation.php # resources/lang/pt-PT/validation.php # resources/lang/ro/validation.php # resources/lang/ru/validation.php # resources/lang/sl/validation.php # resources/lang/sr-CS/admin/settings/general.php # resources/lang/sr-CS/validation.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/sv-SE/auth/message.php # resources/lang/sv-SE/button.php # resources/lang/sv-SE/mail.php # resources/lang/sv-SE/validation.php # resources/lang/ta/validation.php # resources/lang/th/validation.php # resources/lang/tl/validation.php # resources/lang/tr/mail.php # resources/lang/tr/validation.php # resources/lang/uk/admin/accessories/table.php # resources/lang/uk/admin/asset_maintenances/message.php # resources/lang/uk/admin/asset_maintenances/table.php # resources/lang/uk/validation.php # resources/lang/ur-PK/validation.php # resources/lang/vi/admin/settings/general.php # resources/lang/vi/validation.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/validation.php # resources/lang/zh-HK/validation.php # resources/lang/zh-TW/validation.php # resources/lang/zu/validation.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/company-select.blade.php # routes/api.php	2021-09-21 23:46:50 -07:00
Ivan Nieto Vivanco	c3eb7a3425	Remove aditional bindings that 'overflows' the generated queries	2021-09-07 00:15:21 -05:00
Tobias Regnery	eced1ab77f	Fix advanced search with serial and another field ... The advanced search in /hardware produces incorrect results if the serial is combined with another field like category. There is a typo as the fieldname 'product_key' doesn't exist. Change this to 'serial'. Also change the last If-Statement from ->orWhere() to ->where(). Now additional fields like custom fields can be combined with other searches in an And-Clause. I think this function could be simplified further, but this is the minimal bugfix.	2021-08-05 15:07:28 +02:00