snipe-it

mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 16:14:18 -08:00

Author	SHA1	Message	Date
cram42	4b4c228f1a	Correct parameter order	2023-02-01 17:56:23 +11:00
cram42	b72c6b7afc	Fix 2D barcode defaults	2023-02-01 17:48:39 +11:00
snipe	f7ae5db4f3	Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories	2023-01-31 19:56:43 -08:00
snipe	2d45ebe103	Merge pull request #12433 from inietov/fixes/asset_declined_date_issues Fixed Invalid date value on assets acceptance mail notification	2023-01-31 19:14:51 -08:00
Brady Wetherington	a4173e3881	Permit not-delegated+dont-expire-password+normal-accounts to login	2023-01-31 16:49:41 -08:00
Godfrey M	1e0c58c3cf	saves data correctly now	2023-01-31 11:32:05 -08:00
lukasfehling	cddae4869f	fixed the endpoint for user notification with all their assigned assets	2023-01-31 18:27:25 +01:00
Godfrey M	fc044528b8	validation is working, success message appears, database is not updating	2023-01-30 16:10:02 -08:00
Ivan Nieto Vivanco	ccc7b78f62	Store the acceptance dates with format YYY-mm-dd	2023-01-30 15:11:41 -06:00
snipe	22b0b9b090	Fixed gates on fieldsets Signed-off-by: snipe <snipe@snipe.net>	2023-01-26 17:05:41 -08:00
snipe	583a0412fe	Added edit fieldsets translations Signed-off-by: snipe <snipe@snipe.net>	2023-01-26 17:03:23 -08:00
Godfrey M	a63ea560ae	adds submit button, getting setAttribute error	2023-01-26 15:17:08 -08:00
Marcus Moore	39289dd18e	Use user provided alert email for checkout acceptances	2023-01-26 13:18:18 -08:00
Marcus Moore	6fc8982478	Have acceptance result notifications adhere to alerts enabled setting	2023-01-26 12:59:33 -08:00
akemidx	df31a76906	fixed apostraphe	2023-01-26 15:02:39 -05:00
Brady Wetherington	4a54586690	Add to Accessories#index an additional gate-check against reports.view	2023-01-26 11:56:06 -08:00
Godfrey M	62b4c79150	adds a couple error messages	2023-01-25 16:38:08 -08:00
Godfrey M	a69cb6204a	adds rest of inputs, and corrects Data binding	2023-01-25 16:22:34 -08:00
Brady Wetherington	cfe9c687f9	Mark a bunch of SCIM config as nullable	2023-01-25 15:54:57 -08:00
Brady Wetherington	91cf683f3d	Re-do the entire SCIM config so it no longer inherits	2023-01-25 15:53:46 -08:00
Godfrey M	2e22eeade5	adds one input	2023-01-25 14:29:20 -08:00
akemidx	53d8008a5f	Merge branch 'vip_tag' of github.com:akemidx/snipe-it into vip_tag	2023-01-25 17:14:29 -05:00
akemidx	b363524305	vipuser label updated to vip	2023-01-25 15:58:44 -05:00
snipe	4c3354b778	Merge branch 'develop' into vip_tag	2023-01-24 20:29:43 -08:00
Brady Wetherington	ab12ad1140	Resolves Rollbar error 16746 - missing array key 'extension'	2023-01-24 18:19:26 -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
Brady Wetherington	b00333c9f5	Merge remote-tracking branch 'upstream/develop' into develop	2023-01-24 17:36:39 -08:00
Brady Wetherington	c9f0f5fe8b	Change Accessories report to use server-side pagination from URL	2023-01-24 17:35:44 -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
akemidx	596846a94a	Add VIP Checkbox	2023-01-24 15:29:27 -05:00
Marcus Moore	b92d1d3ec7	Logically group query when searching users to scope to company	2023-01-24 11:54:56 -08:00
Godfrey M	0f8ee22053	Creates Slack Setting Form	2023-01-24 09:25:05 -08:00
snipe	dc155846ca	Hoist the autorization higher in the stack so we’re not doing logic or math when the user isn’t authorized to touch this Signed-off-by: snipe <snipe@snipe.net>	2023-01-23 21:49:17 -08:00
snipe	7a9ea91be0	Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck	2023-01-23 21:39:55 -08:00
snipe	02dcb0fbd7	Shorten the additiona form request invocation to just `ImageUploadRequest` We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file. Signed-off-by: snipe <snipe@snipe.net>	2023-01-23 21:37:35 -08:00
cram42	c2c009a018	Merge branch 'develop' into develop	2023-01-24 09:53:42 +08:00
Jeremy Price	d3bcc48ae5	[imports] fix "Backup before importing?" checkbox on import page We were always taking backups before import, no matter the status of this box. Turns out we were testing for the presence of the property defined by the checkbox, rather than the value of the property, and as such were always doing a backup. We're now checking the status, and it behaves as expected	2023-01-23 15:08:59 -08:00
snipe	41537a2449	Added field to the API controller endpoints Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:56:44 -08:00
snipe	5f9af7d509	Updated API response Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:56:28 -08:00
snipe	febfcd4803	Updated model with new field Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:56:19 -08:00
snipe	cad76f671a	Added asset_eol_date to blade Signed-off-by: snipe <snipe@snipe.net>	2023-01-22 00:55:42 -08:00
snipe	cd8cb445ba	Corrected fieldname for user fieldname for avatar in Controller Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:20:53 -08:00
snipe	48c85966d7	Added gravatar and avatar as fillable Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:07:17 -08:00
snipe	a0aed19f95	Refactor image handler Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:05:55 -08:00
snipe	f77d871dff	Use the imageHandler for profile avatar changes Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:05:20 -08:00
snipe	60eab08735	Added `->with(‘users as users_count’)` in Accessory query Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:41:07 -08:00
snipe	90c1631820	Added users_count to transformer for API Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:40:35 -08:00
snipe	dceb77d4d4	Refactored numRemaining, removed unnecessary numCheckout Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:40:20 -08:00
snipe	46e3e8a3dd	Added new users_count field to API Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:39:53 -08:00
Marcus Moore	181f96ad33	Allow users to set a blank asset name during checkout	2023-01-19 12:35:44 -08:00
snipe	fa9116b184	Merge pull request #12369 from snipe/features/add_byod_to_assets Added BYOD to assets	2023-01-18 16:09:45 -08:00
snipe	155977de2d	Merge pull request #12370 from marcusmoore/fix/file-upload-tab-permissions Fixed file uploads for accessories, components, and consumables	2023-01-18 16:08:53 -08:00
snipe	378dc968b7	Derp. Copypasta Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 15:44:28 -08:00
snipe	0c39c7a53d	Updated blades to add byod as a “status” Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:25:46 -08:00
snipe	acd182e3d2	Added byod to presenter with boolean formatter Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:10:30 -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	f626413502	Added byod to API transformer Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:04:02 -08:00
snipe	b80d52a9c3	Added byod to asset controller for create and update methods Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:03:51 -08:00
snipe	ee4b8f4694	Added byod to API controller Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:03:31 -08:00
Godfrey M	7ce230fadc	missed a few renames	2023-01-18 08:57:59 -08:00
snipe	956bd384b0	Merge pull request #12364 from snipe/features/make_2fa_sortable BREAKING: Partial fix for #12356: Make 2FA sortable in user list	2023-01-17 20:24:05 -08:00
snipe	c3e4d9d773	Make column name consistent with field name (BREAKING) Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 18:27:47 -08:00
snipe	f08babfa8a	Just moved some stuff around - no actual meaningful code changes Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 17:22:03 -08:00
snipe	4ef0005e7c	BREAKING: changed API fieldname result for 2FA Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 17:21:40 -08:00
snipe	dbda288a44	Formatting changes only for readability Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 17:21:20 -08:00
snipe	eaf9332096	Added filterability to 2FA fields Signed-off-by: snipe <snipe@snipe.net>	2023-01-17 17:21:03 -08:00
Marcus Moore	23a1b2d60a	Register the consumables.files ability	2023-01-17 17:15:23 -08:00
Marcus Moore	6c89f08193	Register the accessories.files ability and allow users with the ability to upload files for accessories	2023-01-17 16:59:50 -08:00
corydlamb	295f0dd1f5	Update WelcomeNotification.php Used htmlspecialchars_decode to fix the issue I had involving Ampersands in the password field (and I'm assuming the other fields) of the welcome notification email. Changes are all in lines 22-26. Sorry if I'm not doing this very well as this is my first pull request.	2023-01-17 19:33:25 -05:00
Marcus Moore	e23ee7540d	Register the components.files ability	2023-01-17 15:45:40 -08:00
snipe	f4630d67be	Added catergories to default visiable set Signed-off-by: snipe <snipe@snipe.net>	2023-01-15 17:07:50 -08:00
snipe	9d0a15990e	Check that the `$use_db_field` has a value before attempting a delete Signed-off-by: snipe <snipe@snipe.net>	2023-01-13 11:26:11 -08:00
snipe	4f8951f6f1	Merge pull request #12335 from uberbrady/windows_snipeit_restore Fixed #12004: Snipe-IT restore didn't work on Windows	2023-01-11 11:03:44 -08:00
snipe	459c95064e	Fixed default Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 17:54:04 -08:00
snipe	0b0fdd8aa5	Small formatting fixes, fixed typo in comment Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:32:18 -08:00
snipe	8f3a237ea0	More comments Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:29:51 -08:00
snipe	151719a91c	Added comments Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:24:46 -08:00
snipe	825df2cf75	Load up the item counts with the individual API methods for accurate numbers without n+1 Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:17:03 -08:00
snipe	b66cd313b9	Refactored itemCount() to use existing blah_count fields if they exist Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 16:16:25 -08:00
snipe	bef4224e14	Added notes to itemCount() Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 13:50:24 -08:00
snipe	249b188654	Refactor category API and transformer for query optimization Signed-off-by: snipe <snipe@snipe.net>	2023-01-10 13:30:01 -08:00
Brady Wetherington	2170343958	Fixed #12004 : Snipe-IT restore didn't work on Windows	2023-01-10 13:06:47 -08:00
snipe	529b005d1e	We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 21:05:51 -08:00
snipe	7846251d25	Re-added return for no results (derp) Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 20:43:57 -08:00
snipe	cc665d50ed	One more refactor, hopefully simplifying Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 20:40:12 -08:00
snipe	ae76d46f87	Small refactor to ALWAYS return deleted assets in a collection transformer Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 20:23:05 -08:00
snipe	bf849128fc	Replicate the response behavior in the bySerial endpoint Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 19:57:47 -08:00
snipe	44be8c8f60	Determine which transformer to use based on number of assets Signed-off-by: snipe <snipe@snipe.net>	2023-01-09 19:54:21 -08:00
Brady Wetherington	39b1a5a8a0	Remove old cache key for settings	2023-01-09 16:19:25 -08:00
Brady Wetherington	2d0ac5b48b	The cache system in getSettings() cached values "forever." That's bad.	2023-01-09 16:16:09 -08:00
Brady Wetherington	cbffd105a2	Fix LDAP default group feature	2023-01-09 15:23:19 -08:00
snipe	6e42bce409	Removed $start variable from calback Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 18:04:06 -08:00
snipe	1a3c947b14	Chunk sync script Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 17:57:52 -08:00
snipe	381f89c5a8	Added format to array Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 13:15:30 -08:00
snipe	db43628bdc	Added default field info to models API response Signed-off-by: snipe <snipe@snipe.net>	2023-01-05 13:12:54 -08:00
snipe	9c63f426d9	Added missing translation string Signed-off-by: snipe <snipe@snipe.net>	2023-01-04 14:09:14 -08:00
Brady Wetherington	c4f900e9af	Change license_seat changing method to properly 'true up' license seats	2023-01-04 13:02:53 -08:00
snipe	fa439a1928	Check that the array key exists before trying to seed it Signed-off-by: snipe <snipe@snipe.net>	2023-01-03 14:45:23 -08:00
snipe	d187174f00	Merge pull request #12090 from Godmartinz/deparmtnet_name_validator Added: validation for department names at Company locations	2022-12-22 11:29:12 -08:00
Ivan Nieto Vivanco	3a9b8a4993	Calculate the proper amount of people in the dashboard if Full Company Support is enabled	2022-12-20 18:39:17 -06:00
snipe	88291cadc1	Merge pull request #12254 from akemidx/documentating_something Commenting on a scope in Models/Company.php	2022-12-19 12:41:32 -08:00
akemidx	94afe2bc6a	edits & typo fixes	2022-12-19 14:48:43 -05:00
snipe	399c7590cd	Merge pull request #12209 from snipe/fixes/error_downloading_unaccepted_assets Fixed 500 when downloading the Unaccepted Assets report [sc-19555]	2022-12-15 14:19:41 -08:00
snipe	d0c5ba70f6	Merge pull request #12242 from inietov/features/add_purchase_cost_column Added `purchase_cost` to user's default view [sc-19680]	2022-12-15 12:42:29 -08:00
akemidx	133d6ffa50	Commenting on a scope in Models/Company.php	2022-12-15 15:18:24 -05:00
snipe	29c2ff56ec	Merge pull request #12188 from snipe/fixes/decrease_logging_for_saml_when_not_enabled Removed extra logging case that was very noisy	2022-12-15 11:26:49 -08:00
snipe	227fef76ee	Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group Adds a permission group selection for directory sync	2022-12-15 11:06:53 -08:00
Ivan Nieto Vivanco	b142f8e012	Add the permission to show purchase cost column to non-admin sessions	2022-12-14 23:00:35 -06:00
snipe	418ddcfac3	Merge pull request #9876 from Toreg87/fixes/locations-deletable Fixed #9875: Make locations deletable for non Superuser-Accounts with FullMultipleCompanySupport	2022-12-14 17:46:53 -08:00
snipe	d13a237000	Merge pull request #12205 from Godmartinz/sc19675_add_remote_to_importer Adds remote field to the user importer	2022-12-14 12:13:18 -08:00
snipe	fabefa61b0	Merge pull request #12243 from akemidx/new_grey_out_when_no_assets Created method in users.php for adding up all assigned to user and pr…	2022-12-13 14:00:48 -08:00
akemidx	f3e57d7dc0	fixing PR	2022-12-13 16:00:59 -05:00
snipe	c432fb9d70	Merge pull request #12181 from Godmartinz/gh12163_asset_age Adds asset age to asset index and asset view pages	2022-12-13 10:28:17 -08:00
akemi	07ae91b00f	Created method in users.php for adding up all assigned to user and providing an integer value. this then used to grey out buttons on user view if user has nothing assigned.	2022-12-12 15:47:53 -05:00
Godfrey M	fa872b09a9	fixes a typo, the world is great again	2022-12-12 10:38:31 -08:00
snipe	4ac09ff4e4	Add email in assigned_to on asset transformer Signed-off-by: snipe <snipe@snipe.net>	2022-12-09 16:07:17 -08:00
snipe	775df0ab60	Merge pull request #12221 from snipe/fixes/throttles_reset_password_form Add throttle for password reset form	2022-12-08 14:51:22 -08:00
snipe	f7da87520c	Merge pull request #12134 from Godmartinz/custom_report_user_fields_missing fixes a regression with the csv assigned to fields	2022-12-07 16:18:32 -08:00
snipe	c3a6874b16	Add throttle for password reset form Signed-off-by: snipe <snipe@snipe.net>	2022-12-06 20:42:40 -08:00
Ivan Nieto Vivanco	eb67d1b064	Filter items from the report if null returned	2022-12-06 18:00:16 -06:00
Godfrey M	bbd04f8876	adds the rest of the fields for Remote	2022-12-06 11:13:24 -08:00
Godfrey M	36901d271b	adds csvmatch for remote. Im a bit lost though lol	2022-12-05 16:28:19 -08:00
akemi	2f8a435e18	fixing curly quotes	2022-12-05 18:06:28 -05:00
akemi	55f5e7866d	edits for PR	2022-11-29 15:59:36 -05:00
Godfrey M	3206929ee4	adds AgeFormatter, not working yet	2022-11-29 09:51:42 -08:00
snipe	1fe0bfe17e	Removed extra logging case that was very noisy Signed-off-by: snipe <snipe@snipe.net>	2022-11-28 19:27:42 -08:00
akemi	39e06a8856	Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated	2022-11-28 14:16:22 -05:00
Godfrey M	8d861cfd82	adds age to the asset table	2022-11-28 10:59:18 -08:00
snipe	3ef578eb56	Merge pull request #12164 from Robert-Azelis/patch-7 Fix categories view columns matching	2022-11-23 18:47:02 -08:00
Ivan Nieto Vivanco	c082d8b90e	Return empty string if no MAIL_REPLYTO_ADDR var set	2022-11-23 18:22:31 -06:00
Robert-Azelis	c2cfd8ff53	Update CategoryPresenter.php	2022-11-23 19:00:08 +01:00
Robert-Azelis	20ad4fb681	Update CategoryPresenter.php Fix snipe#12153	2022-11-23 18:42:38 +01:00
snipe	ba4c37a7f4	Merge pull request #12139 from snipe/fixes/custom_fields_api_patches Fixed #9949 - PATCH to custom fields failing on validation (alt approach to #12011)	2022-11-17 21:28:39 +00:00
snipe	f0c5560c1b	Merge pull request #12141 from Godmartinz/adds_serial_number_to_history Added `serial` column to the user history page	2022-11-17 21:15:26 +00:00
snipe	774962c122	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2022-11-17 21:14:35 +00:00
Godfrey M	86bc409d3a	adds serial column to the action logs	2022-11-17 12:57:53 -08:00
snipe	24841a75d4	Move common things into the model level validation Signed-off-by: snipe <snipe@snipe.net>	2022-11-17 19:41:10 +00:00
Godfrey M	a02a04d601	fixes a regression with the csv assigned to fields	2022-11-16 16:34:57 -08:00
snipe	3997085faf	Merge pull request #12122 from Godmartinz/fixes_checkout_to_all_description fixes checkout to all description	2022-11-16 21:56:53 +00:00
snipe	489895a5fa	Added comments and spacing for readability Signed-off-by: snipe <snipe@snipe.net>	2022-11-16 17:48:28 +00:00
snipe	1122562b4e	Handle use case where there are no custom fields for any assigned models Signed-off-by: snipe <snipe@snipe.net>	2022-11-16 17:45:50 +00:00
snipe	5df76155ce	Check for the `format` index in the `$data` array when creating a new custom field via API Signed-off-by: snipe <snipe@snipe.net>	2022-11-16 15:53:16 +00:00
Instead of looking elsewhere, it is better to come here together	2fc7a15372	Fixed: #12109	2022-11-16 18:22:11 +08:00
Godfrey M	8a0517fb5d	removes data dump	2022-11-15 15:59:47 -08:00
Godfrey M	90828e3a87	fixes variable name	2022-11-15 15:51:52 -08:00
Godfrey M	45636b8114	adds should_autoassign boolean to users table	2022-11-15 15:42:57 -08:00
Godfrey M	9fefdea9de	fixes checkout to all description	2022-11-15 12:50:46 -08:00
snipe	6400bdc266	Merge pull request #12120 from snipe/features/added_deleted_filter_to_search_by_tag Added ability to include deleted items in tag search endpoint	2022-11-15 17:54:34 +00:00
snipe	ffd252a00c	Merge pull request #12119 from lukasfehling/feature/added-endpoint-for-user-notification Added: API endpoint to trigger a user email notification with their assigned assets	2022-11-15 17:51:15 +00:00
snipe	7fcf6f2463	Removed deleted parameter Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:47:21 +00:00
snipe	2c5a0d370c	Clean up API byserial and bytag, allow deleted param Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:33:56 +00:00
snipe	bcbe517446	Added ability to include deleted items in tag search endpoint Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:18:09 +00:00
lukasfehling	d9a9bd1c0d	Added a api endpoint for sending email notifications to users with their assigned assets	2022-11-15 18:17:51 +01:00
snipe	9a5d431962	Allow searching firectly for asset tag and serial Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:13:26 +00:00
snipe	50431c046f	Fixed missing slash in stdClass Signed-off-by: snipe <snipe@snipe.net>	2022-11-15 17:04:06 +00:00
snipe	ae259f36ae	Merge pull request #12106 from fernando-almeida/develop Fix HTTP AssetTransformer to generate an empty object for missing custom fields	2022-11-15 15:54:43 +00:00
snipe	56c4fa7c27	Override display settings if field is encrypted Signed-off-by: snipe <snipe@snipe.net>	2022-11-14 22:41:31 +00:00
Fernando Almeida	47ee2a8153	Fix HTTP AssetTransformer to generate an empty object for missing custom_fields instead of an empty array.	2022-11-14 16:31:08 +00:00
Cram42	17e81af4cd	Add more Avery label sheets	2022-11-12 20:29:50 +08:00
Cram42	ffce6ec327	Need uppercase	2022-11-12 20:29:34 +08:00
snipe	1e34398c99	Permissions check on the field itself Signed-off-by: snipe <snipe@snipe.net>	2022-11-10 17:19:12 +00:00
snipe	1fa624420e	Removed unneeded relationships Signed-off-by: snipe <snipe@snipe.net>	2022-11-10 16:46:49 +00:00
Cram42	f849fcca89	Change the way fields are passed	2022-11-10 18:54:02 +08:00
Godfrey M	92ae271292	adds validation for department names at Company locations	2022-11-09 13:11:33 -08:00
snipe	7c37c70164	Added new field to allowed_fields so that the API can change them if needed Signed-off-by: snipe <snipe@snipe.net>	2022-11-08 15:27:22 +00:00
snipe	52dc5aa4ba	Added field to controller and tranformer Signed-off-by: snipe <snipe@snipe.net>	2022-11-08 15:26:59 +00:00
snipe	04b6f023ae	Use new upload string Signed-off-by: snipe <snipe@snipe.net>	2022-11-03 13:57:50 -07:00
snipe	3c7d63c060	Disallow uploads if app is locked Signed-off-by: snipe <snipe@snipe.net>	2022-11-03 13:52:23 -07:00
snipe	6d5ace0458	Merge pull request #12049 from uberbrady/improve_scim_externalid_support Fixed writes to the `externalId` from SCIM	2022-11-02 15:43:55 -07:00
Cram42	53513d93fa	Rework TZe labels for Asset Tag support	2022-11-02 22:38:00 +08:00
Cram42	36210f1c6a	Allow settings to be overridden in request	2022-11-02 19:30:45 +08:00
Cram42	48fb4f2439	Add labels route for testing layouts	2022-11-02 17:23:52 +08:00
Cram42	fb467d9078	Include Asset for advanced users	2022-11-02 17:20:01 +08:00
Cram42	4fee5ece43	Support Avery L7163	2022-11-02 16:08:10 +08:00
Cram42	4bb40adfce	Add Asset Tag as separate supported feature	2022-11-02 16:07:50 +08:00
Cram42	06ce40ac08	Don't add data if it's not there	2022-11-02 16:05:52 +08:00
Cram42	a8b6a4a259	Allow passing "template" param	2022-11-02 16:04:40 +08:00
Cram42	a60ee7736b	Add P-touch TZe 12mm Tape Example	2022-11-02 12:22:55 +08:00
snipe	eb81c290dc	Accessory file upload Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:50:39 -07:00
snipe	97aeb1fcec	Use the generic file uploads strings Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:31:23 -07:00
snipe	f1cb7ee410	Fixed some translations Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:28:39 -07:00
snipe	84c0f50266	Added ComponentFilesController Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:10:04 -07:00
Cram42	d0eb3cfc9b	Merge branch 'feature-label2' into develop	2022-11-02 10:09:46 +08:00
snipe	3d3a4b02fc	Added helper method for uploads Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:09:34 -07:00
Cram42	19150aeb44	Add P-touch TZe 24mm Tape Example	2022-11-02 10:09:11 +08:00
snipe	2106b64da6	Fixed some layout issues Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 19:06:49 -07:00
snipe	25f69a7bd2	Added consumable methods for uploads Signed-off-by: snipe <snipe@snipe.net>	2022-11-01 17:52:28 -07:00
Cram42	6b2fe582ca	Merge branch 'feature-label2' into develop	2022-11-01 20:12:28 +08:00
cram42	7e2546b31f	Merge branch 'snipe:develop' into develop	2022-11-01 20:04:59 +08:00
Cram42	7b29ddd283	Tie into tag generation	2022-11-01 20:02:12 +08:00
Cram42	6de48b4dc8	Implement settings for labels	2022-11-01 20:00:53 +08:00
Cram42	5558a005b9	Implement API for labels	2022-11-01 19:57:51 +08:00
Cram42	bb09f0168f	Create Label View/Generator	2022-11-01 19:56:53 +08:00
Cram42	4ed728d954	Add template to simulate legacy label	2022-11-01 19:54:00 +08:00
Cram42	bbecdb6768	Add QR example	2022-11-01 19:53:11 +08:00
Cram42	df89406987	Create Label model and example	2022-11-01 19:52:34 +08:00
Cram42	7c355cef2d	Add helper to convert between units of measurement	2022-11-01 19:49:57 +08:00
Brady Wetherington	4e5c878b73	Needed to fix the way we write externalId from SCIM	2022-10-31 19:15:08 -07:00
snipe	7cb4740359	Merge pull request #11766 from snipe/fixes/wtf_method_names_derp Fixed (?) method name?	2022-10-26 17:39:11 -07:00
Cram42	0e69e4248c	Fix: Multiple outputs at hardware/{id}/label	2022-10-27 08:12:42 +08:00
snipe	c1eee2cc72	Corrected string for invalid current password Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 12:18:29 -07:00
snipe	12c7223bcd	Renamed column back to assets_count for legacy Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 09:39:03 -07:00
snipe	28b0d8cf0f	Null expected_checkin on user bulk checkin and delete Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 00:54:37 -07:00
snipe	e670ffe349	Added Assets Assigned to tab Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 00:16:06 -07:00
snipe	a94f1c4a64	Cleaned up and added comments Signed-off-by: snipe <snipe@snipe.net>	2022-10-26 00:15:52 -07:00
Brady Wetherington	1e3281c76c	Add externalId support to SCIM integration	2022-10-25 14:19:01 -07:00
snipe	3b16157d6b	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2022-10-21 17:43:53 -07:00
snipe	4eed2baa31	Added default tab to locations Signed-off-by: snipe <snipe@snipe.net>	2022-10-20 19:06:58 -07:00
Brady Wetherington	bc78d341a0	Caches manager lookups in LDAP for performance boost	2022-10-20 16:52:40 -07:00
Brady Wetherington	12d86bd6e2	Erroneous line-break removal - re-add	2022-10-19 19:01:52 -07:00
Brady Wetherington	c4f11de90d	Remove incorrect comment.	2022-10-19 18:49:19 -07:00
Brady Wetherington	8fb61cf5f8	Try to better handle LDAP Manager settings that don't line up with what we expect	2022-10-19 18:36:16 -07:00
Godfrey M	f2d4a61e3c	removes dead space	2022-10-18 15:31:37 -07:00
Godfrey M	3f25a1bf61	removes dead code	2022-10-18 15:25:38 -07:00
Godfrey M	f9ac447dd1	adds default group to LDAP	2022-10-18 15:18:09 -07:00
Godfrey M	d359bcb88d	adds proper spacing	2022-10-17 13:15:10 -07:00
Godfrey M	28059c878a	gets the proper amount of months and fixes typo of the word depreciation	2022-10-17 11:16:29 -07:00
Phan Nguyen	e457b2e98d	Correct assignedusers relation setting	2022-10-17 13:10:09 +07:00
snipe	b7bcfaccc9	Merge pull request #11834 from uberbrady/try_catch_notifications try/catch wrap notifications on checkin/checkout	2022-10-13 14:20:22 -07:00
snipe	ac055c01dc	Use admin ID for audit log notification Signed-off-by: snipe <snipe@snipe.net>	2022-10-12 15:59:43 -07:00
snipe	98f2e0271b	Merge pull request #11942 from nh314/develop Correct comparison logic	2022-10-12 10:55:29 -07:00
snipe	0312ecf09d	Sets nullable attribute on validation Signed-off-by: snipe <snipe@snipe.net>	2022-10-12 10:30:47 -07:00
Phan Nguyen	8ff109e9da	Correct comparison logic Comparison operator should be greater than or equal	2022-10-08 12:54:15 +07:00
snipe	14b7319b63	Added start/end to sortable columns Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 17:07:07 -07:00
snipe	9d641573b5	Make the APU return null instead of blank Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 17:01:04 -07:00
snipe	bdfac1a345	Added start/end to the users API Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:58:37 -07:00
snipe	f7a9be92ca	Store data for start and end Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:58:26 -07:00
snipe	56ba8a7e24	Added API select fields and filters Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:58:16 -07:00
snipe	cf62761d18	Added date casting and fillable to models Signed-off-by: snipe <snipe@snipe.net>	2022-10-05 16:57:59 -07:00
snipe	bcebc1e33b	Stylistic refactoring Signed-off-by: snipe <snipe@snipe.net>	2022-10-04 16:37:33 -07:00
snipe	891b5b2882	Added routes, language Signed-off-by: snipe <snipe@snipe.net>	2022-10-04 15:45:25 -07:00
Ivan Nieto Vivanco	25c10c3819	Filter non-asset items from download unaccepted assets report	2022-10-03 18:12:30 -05:00
snipe	b07c4caa37	Extra whitespace Signed-off-by: snipe <snipe@snipe.net>	2022-09-30 11:47:27 -07:00
snipe	5a7e35c0e8	Made a conditional escape according to .env Signed-off-by: snipe <snipe@snipe.net>	2022-09-30 09:48:43 -07:00
snipe	bae200edd7	Use EscapeFormula() in CSV export Signed-off-by: snipe <snipe@snipe.net>	2022-09-30 09:29:17 -07:00
snipe	36484d50ef	Fixed depreciation API call Signed-off-by: snipe <snipe@snipe.net>	2022-09-29 17:07:42 -07:00
Brady Wetherington	420c216973	Added counts to Dashboard Pie Chart legends and tooltips	2022-09-29 13:20:58 -07:00
snipe	70c766e8b3	Added setting to choose dashboard type Signed-off-by: snipe <snipe@snipe.net>	2022-09-29 04:16:46 -07:00
snipe	0b2ce7be07	Fixed #11521 - switch to using status meta from status label name Signed-off-by: snipe <snipe@snipe.net>	2022-09-29 03:48:58 -07:00
Katharina Drexel	4f5d536e32	Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.	2022-09-28 14:52:02 +02:00
snipe	055a2f827f	Merge pull request #11872 from sunflowerbofh/tmp-replace-patchwork-utf8 Fixed #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.	2022-09-27 16:46:12 -07:00
snipe	a7b83fc531	Merge pull request #11854 from inietov/fixes/location_issue_during_import Fixed #11847 404 error during Import if a checkout type of location is specified and no checkout location is passed	2022-09-27 14:34:26 -07:00
Katharina Drexel	8316a4eb92	Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.	2022-09-26 12:06:06 +02:00
Ivan Nieto Vivanco	c0f83a7927	Delete not necessary conditional	2022-09-20 19:02:01 -05:00
Ivan Nieto Vivanco	5a1062f0f4	Delete debugging symbols (just kidding, it's just a dd() function)	2022-09-20 18:58:31 -05:00
Ivan Nieto Vivanco	c32676596c	Redirect correctly if not enough license seats exists to be checkout	2022-09-20 18:55:53 -05:00
Ivan Nieto Vivanco	e267f5491a	Adds a check for empty location values on import	2022-09-19 19:05:48 -05:00
snipe	f75d348dc0	Fixed license policy method Signed-off-by: snipe <snipe@snipe.net>	2022-09-16 14:06:46 -07:00
snipe	dcab1381e7	Check for licenses.files permissions Signed-off-by: snipe <snipe@snipe.net>	2022-09-16 14:00:27 -07:00
snipe	24910433a1	Fixed 500 when depreciation is set but no purchase_date Signed-off-by: snipe <snipe@snipe.net>	2022-09-15 15:39:47 -07:00
Brady Wetherington	1899e4d1e8	try/catch wrap notifications on checkin/checkout	2022-09-15 13:18:42 -07:00
Ivan Nieto Vivanco	41b75704e3	Removes format when changing to custom fields elements that doesn't need it	2022-09-15 11:21:02 -05:00
snipe	ac4f91918e	Merge pull request #11771 from rnelsonee/PAT_test Fixed #11769: PAT Test hardcoded text	2022-09-14 20:01:18 -07:00
snipe	3192a68b06	Pulled assetlog from custom report controller Signed-off-by: snipe <snipe@snipe.net>	2022-09-14 18:17:52 -07:00
Godfrey M	6b6a079440	fixes current value and monthly depreciation on reports and calculations	2022-09-14 17:01:18 -07:00
Godfrey M	a0624fe179	reworks the depreciation formula, includes months passed instead of months remaining	2022-09-14 16:00:21 -07:00
Godfrey M	9b448227f7	tinkering to no avail	2022-09-13 11:40:10 -07:00
Ivan Nieto Vivanco	d51eca20f0	Add min_amt field in Consumables and Accessories imports	2022-09-12 18:11:48 -05:00
Godfrey M	28bc97f29f	one line away from this being over with	2022-09-12 11:40:16 -07:00
Ivan Nieto Vivanco	3aff97ace1	Remove the previous user hashed password	2022-09-06 18:43:35 -05:00
Rick Nelson	6e82de2f47	Fixed #11769 : PAT Test hardcoded text	2022-09-01 11:21:02 -04:00
snipe	ae505ef44d	Literally have no idea how this ever worked Signed-off-by: snipe <snipe@snipe.net>	2022-08-31 19:20:35 -07:00
Godfrey M	193b31e427	select options working, testing sync then done	2022-08-31 12:58:33 -07:00
Godfrey M	70ac8af9c4	.	2022-08-31 09:53:20 -07:00
snipe	dcbd407698	Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance Send notifications when Acceptance Assets actions occur [sc-9917]	2022-08-30 12:14:58 -07: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
Godfrey M	0c362e8b57	gets the groups selector to appear but options are blank	2022-08-29 12:09:56 -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
snipe	96ec96ff7f	Merge pull request #11737 from inietov/fixes/validation_error_still_without_required_rule Fixed Validation error when empty default customfield values	2022-08-25 17:54:04 -07:00
Ivan Nieto Vivanco	0d4e9c183b	Save correct id in action log if the bulk-checkin is of type license	2022-08-25 19:16:48 -05:00
Ivan Nieto Vivanco	1ff2d15c4a	Replace 'required' rule with 'nullable' to allow blank default customfields values	2022-08-25 18:16:50 -05:00
Godfrey M	fc6fefdb4e	adds migration, variables, checkbox,working on groups	2022-08-25 15:19:38 -07:00
snipe	482a7b2a3a	Merge pull request #11700 from inietov/fixes/unaccepted_assets_reminder_500 Fixed 500 error when sending unaccepted assets reminder	2022-08-25 14:00:00 -07:00
snipe	6f0f6c8042	Don’t prevent deletion if user has consumables checked out Signed-off-by: snipe <snipe@snipe.net>	2022-08-25 12:51:02 -07:00
snipe	6fde72a693	Log user out of other devices when they change their password Signed-off-by: snipe <snipe@snipe.net>	2022-08-25 12:24:26 -07:00
snipe	2ad9c39090	Merge pull request #11730 from inietov/fixes/importing_licenses_field_mismatch Fixed #11679 Importing Licenses - Field Mismatch	2022-08-24 17:31:12 -07:00
Ivan Nieto Vivanco	c59fd7b8da	Fix importer field mapping for command line	2022-08-24 19:20:23 -05:00
Ivan Nieto Vivanco	6e85c2e5cb	Delete unused import	2022-08-24 16:30:25 -05:00
Ivan Nieto Vivanco	30d0125cbd	Remove the rule 'required' for default values, if custom field is obligatory	2022-08-24 16:18:11 -05:00
snipe	45f17fea8a	Merge pull request #11510 from sunflowerbofh/tmp-ldap Fixed #11509 allow-ldap-anonymous-bind	2022-08-22 16:32:07 -07:00
snipe	3ac84eab58	Merge pull request #11651 from inietov/fixes/activity_report_search Fixed Search in activity report for full name in relation	2022-08-22 16:23:50 -07:00
snipe	906a36dc1a	Merge pull request #11703 from julian-piehl/fixes/wrong-trans-string Fixed Translation String: wrong key at request canceled message	2022-08-22 16:16:10 -07:00
Warren White	ba7d6dde3f	Fixed #11706 : changes the display of managers username to First Last name	2022-08-19 10:17:25 -07:00
Warren White	4b9a91f55b	Fixed #10565 , #11086 : correctly looks up Manager DN from AD Manager attribute and sets manager id	2022-08-19 09:09:03 -07:00
Peace	94bbf2bf2f	fixed translation string for canceled requests	2022-08-19 13:59:01 +02:00
Ivan Nieto Vivanco	e5cc6ec972	Fixes error 500 if checkout_acceptances table have a created_at null column	2022-08-17 22:02:13 -05:00
snipe	91e824c5b0	Check for nullifying checkboxes Signed-off-by: snipe <snipe@snipe.net>	2022-08-11 18:25:07 -07:00
Ivan Nieto Vivanco	a33ca39237	Figure out declined notifications	2022-08-11 16:00:21 -05:00
Ivan Nieto Vivanco	98bcd82108	Add the mail recipient from configuration in the CheckoutAcceptance model	2022-08-11 15:33:18 -05:00
Ivan Nieto Vivanco	d2c486bb1e	Create the mail template for the acceptance	2022-08-11 15:28:30 -05:00
Godfrey M	814992eb7d	allows company and location ids to be null	2022-08-11 12:47:40 -07:00
Ivan Nieto Vivanco	267997f0a6	Customize the notifications with the needed data	2022-08-11 14:01:11 -05:00
Ivan Nieto Vivanco	0172fe6403	Add Notifiable trait to the CheckoutAcceptance Model	2022-08-11 13:02:25 -05:00
Ivan Nieto Vivanco	509bbbc685	Create Notifications classes for accepted and declined and add some necesary lang strings	2022-08-11 13:01:21 -05:00
Ivan Nieto Vivanco	8cee5060af	Remove unused DB statement	2022-08-10 19:16:04 -05:00
Ivan Nieto Vivanco	a7de97f060	Found a better place for the where condition	2022-08-10 19:13:28 -05:00
Ivan Nieto Vivanco	c1074000f9	Add a concat to search for full name when the relationship search in the users table	2022-08-10 18:27:28 -05:00
snipe	ef099aa644	Reverted notes to note since pivot Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 16:09:56 -07:00
snipe	acd666fdf5	Added notes to user consumables tab Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:34:07 -07:00
snipe	512348cc5a	Added `withInput()` Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:15:09 -07:00
snipe	e3293151a2	Added note on checkout Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:04:59 -07:00
snipe	3ec77724d8	Added note pivot Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:04:34 -07:00
snipe	024a014298	Changed notes to note Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:04:19 -07:00
snipe	c1e5d03340	Added pivot for `note` Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:03:41 -07:00
snipe	e7c47408a7	Derp Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 13:57:42 -07:00
snipe	637604dfaf	Fixed #8928 - add URL and ID to custom asset report Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 13:51:47 -07:00
Brady Wetherington	b6adfa294c	Fixed the active flag to be as it was in later v5 releases Originally implemented here: https://github.com/snipe/snipe-it/pull/10610/files	2022-08-10 12:55:30 -07:00
Godfrey M	92e6ea96b2	if eol is missing from asset model monthly depreciation will be recalculated	2022-08-09 15:05:15 -07:00
snipe	bc4032c2cd	Merge pull request #11617 from inietov/fixes/components_wrong_remaining_inventory Fixed wrong calculation of assigned components	2022-08-05 18:05:21 -07:00
Ivan Nieto Vivanco	c055c91739	Change db query for an existing method	2022-08-04 09:20:20 -05:00
Ivan Nieto Vivanco	ea8f12579d	Calculate the proper amount of assigned components	2022-08-04 07:58:25 -05:00
snipe	5f93d7b3be	Merge pull request #11615 from inietov/fixes/autoincrement_in_importer Fix auto incrementing in CSV importer [sc-19366]	2022-08-03 17:50:23 -07:00
Ivan Nieto Vivanco	9f0ecba9b9	Add autoincrementing asset tags to the import if the CSV column is empty	2022-08-03 12:48:48 -05:00
snipe	9acfceba29	Added relations to report search Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 23:50:10 -07:00
snipe	20fcf7a1e9	Added configuration change to maintenance types Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 20:19:43 -07:00
snipe	cc92d342ea	Added deleted at value Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:37 -07:00
snipe	02caa13222	Removed debugging Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:30 -07:00
snipe	975b4dee2f	Added deleted header Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:58:17 -07:00
snipe	87bed9b294	Fixed typo in code comments Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:24:46 -07:00
snipe	ac72b69ece	Update method name Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:12:28 -07:00
snipe	8e18ce74b2	Update method name Signed-off-by: snipe <snipe@snipe.net>	2022-08-02 19:12:18 -07:00
snipe	1b657ee995	Merge pull request #11601 from vickyjaura183/bugfix/error_404_bulkcheckout Error 404 fixed on submitting without mandatory field	2022-08-02 17:19:22 -07:00
snipe	71facb1850	Merge pull request #11596 from snipe/fixes/unique_undeleted_for_custom_fields Use unique_undeleted instead of unique for custom fields	2022-08-02 17:16:12 -07:00
snipe	e3b13143bf	Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports Adds options to include Deleted assets to custom asset reports	2022-08-02 10:33:57 -07:00
Godfrey M	ff080a2d8f	replace checkboxes with radiobuttons	2022-08-02 10:27:55 -07:00
vishalkumar183	96b40a5edd	Error 404 fixed on sumitting witout mandtory field	2022-08-02 18:44:16 +05:30
Katharina Drexel	8596c54d6a	Fixing query order (otherwise you run into app_key exception before anonymous ldap applied). Signed-off-by: Katharina Drexel <katharina.drexel@bfh.ch>	2022-08-02 14:24:00 +02:00
snipe	0fdbd410b6	Use unique_undeleted instead of unique for custom fields Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 17:10:39 -07:00
snipe	af7ccf3beb	Handle logout route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:17:40 -07:00
snipe	53ff28d2b0	Handle consumables route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:07:56 -07:00
snipe	4a4636bd03	Handle accessories route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 16:06:28 -07:00
snipe	b035003546	Handled hardware route names Signed-off-by: snipe <snipe@snipe.net>	2022-08-01 15:59:54 -07:00
Godfrey M	842dafefec	adds options to include Deleted assets to custom asset reports	2022-08-01 14:52:12 -07:00
snipe	78097df7ff	Aplpies current time to checkin date Signed-off-by: snipe <snipe@snipe.net>	2022-07-21 21:45:25 -07:00
snipe	7313bca403	Checkin without deleting Signed-off-by: snipe <snipe@snipe.net>	2022-07-20 17:57:19 -07:00
Katharina Drexel	9d627936e6	Fixed #11509 : Allow LDAP anonymous bind.	2022-07-20 17:24:20 +02:00
snipe	6428dc5cd2	Removed duplicate supplier_id Signed-off-by: snipe <snipe@snipe.net>	2022-07-13 13:08:15 -07:00
mikeroq	f21824a8e2	Changed comparing the action type from translated in presenter to actual value	2022-07-12 17:59:03 -05:00
snipe	0ccd7e09de	Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include adds a checkbox to exclude archived assets from custom reports	2022-07-12 12:59:18 -07:00
Godfrey M	27039325f3	removed comments, because I forgot	2022-07-12 12:41:07 -07:00
Godfrey M	58c54cc3dc	uses notArchived scope instead now	2022-07-12 12:20:11 -07:00
Godfrey M	48349071ed	accounts for status_id as well	2022-07-12 09:46:44 -07:00
mikeroq	5efe45226d	Fixes Email List of All Assigned being "successful" when the user has no email Added check in view to disable button if there is no email Added translation for title on disabled button and for email check in controller Fixed missing trans for user not found message	2022-07-11 20:02:10 -05:00
snipe	bb091760af	Fixedd unclosed brace Signed-off-by: snipe <snipe@snipe.net>	2022-07-11 17:11:28 -07:00
Godfrey M	309229619b	fixes the order expiring assets are listed in notifications	2022-07-11 12:25:38 -07:00
Godfrey M	75844c5942	adds a checkbox to exclude archived assets from custom reports	2022-07-11 09:56:58 -07:00
snipe	2518e2f0ee	Removed > 300 Signed-off-by: snipe <snipe@snipe.net>	2022-07-08 17:09:56 -07:00
snipe	43e370f35a	Move migrations further up Signed-off-by: snipe <snipe@snipe.net>	2022-07-08 16:40:51 -07:00
snipe	ee4f355e49	Changed logging to debug Signed-off-by: snipe <snipe@snipe.net>	2022-07-05 17:58:45 -07:00
mikeroq	be8869978d	Added import for Setting model	2022-07-04 07:29:01 -05:00
snipe	92d46edca3	Cleaned up logging output Signed-off-by: snipe <snipe@snipe.net>	2022-07-01 13:33:58 -07:00
snipe	45c616639c	Replicates #11444 Signed-off-by: snipe <snipe@snipe.net>	2022-07-01 11:21:02 -07:00
snipe	4e547a3639	Fixed typos :( Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 21:06:36 -07:00
snipe	b910db0617	Fixed #11393 - reject acceptance if no file is present Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 21:01:58 -07:00
snipe	25cb32ca6a	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 18:51:44 -07:00
snipe	e366caf3d1	Merge pull request #11438 from uberbrady/backout_linear_depreciation_math Revert a change in our Linear Depreciation math	2022-06-30 18:38:03 -07:00
Brady Wetherington	f72aa2415f	Revert a change in our Linear Depreciation math; I think the old algorithm was correct	2022-06-30 18:24:45 -07:00
snipe	4edba064d5	Removed duplicate model column in depreciation report Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 18:17:30 -07:00
snipe	1a423a252b	Derp Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 15:22:58 -07:00
snipe	7591f3f092	Added auth filter check regex Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 15:15:49 -07:00
snipe	2cace3c73a	Added LDAP warnings on page load Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 15:08:12 -07:00
snipe	656efc5f92	Fixed missing trans() Signed-off-by: snipe <snipe@snipe.net>	2022-06-30 14:20:15 -07:00
Nathan Butler	0617480f73	Asset checkinbytag now consistent with existingAPI This is a non-breaking change to the checkinbytag endpoint to bring it inline with the usage/formatting of the other bytag endpoints that currently exist - using the URL path to define the asset_tag instead of passing it through as a url query. Both methods will work, but the URL Path method will take precidence if it is used (the query will be ignored if included)	2022-06-30 09:23:52 +10:00
snipe	2262ef818e	Merge pull request #11427 from Godmartinz/email_users_list [feature] adds button to email user list of assets from profile	2022-06-29 15:25:18 -07:00
Brady Wetherington	2451bb9a2b	Make SCIM be more tolerant of missing fields	2022-06-29 14:48:59 -07:00
Godfrey M	cd9d2d0cec	adds docblock	2022-06-29 13:01:29 -07:00
Godfrey M	e471aa8639	adds button to email user list of assets from profile	2022-06-29 11:15:15 -07:00
snipe	5af6330398	Merge pull request #11417 from ntbutler-nbcs/master [Feature] - Add checkoutByTag API endpoint for assets	2022-06-29 05:03:01 -07:00
snipe	daaf8713d8	Merge branch 'dampfklon-9813-duplicate-accept-asset' into develop	2022-06-29 04:58:26 -07:00
snipe	5b02d9ed06	Merge branch '9813-duplicate-accept-asset' of https://github.com/dampfklon/snipe-it into dampfklon-9813-duplicate-accept-asset Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # resources/views/account/accept/create.blade.php	2022-06-29 04:58:13 -07:00
snipe	b04cf20735	Merge pull request #10758 from inietov/fixes/badmethodcallexception_undefined_method_Asset.unaccepted_develop Fixes BadMethodCallException Call to undefined method App\Models\Asset::unaccepted() for master [ch-17636]	2022-06-29 04:34:51 -07:00
Nathan Butler	e28e7e37b8	Removed unneeded checks when searching for asset	2022-06-29 17:49:50 +10:00
snipe	b590f29f33	Attempt a download via API Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:59:13 -07:00
snipe	1debdc47cf	Backups endpoint Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:30:17 -07:00
snipe	53bc15900b	Formatted show api Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:23:55 -07:00
snipe	90fe7af863	Small refactor Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:18:16 -07:00
snipe	67ad24af08	Return token ID in cli Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:13:25 -07:00
Nathan Butler	67e9b7795a	Added asset checkoutByTag API endpoint	2022-06-29 16:11:57 +10:00
snipe	52332bc9ed	Include token ID in payload Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 23:10:56 -07:00
snipe	a711e608c9	Changed siganture to be clearer Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 22:26:37 -07:00
snipe	2f7c04362e	Make -kkey-only a flag Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 22:20:55 -07:00
snipe	9b6fd7e19a	Set $accessTokenName Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 22:11:46 -07:00
snipe	9680b02bce	Check that the user has permission to create their own API keys Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 22:09:18 -07:00
snipe	e7de7d1716	Show user info as well Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 22:06:46 -07:00
snipe	112f147596	Console script to generate API tokens Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 22:04:39 -07:00
snipe	413487de80	Made method naming consistent Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 21:32:12 -07:00
snipe	1158fa9ea8	Added personal access tokens to api Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 21:29:15 -07:00
snipe	3df9260ca8	Added additional filters for api indexes Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 19:59:45 -07:00
snipe	71c8050883	Added additional search filters for location API Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 19:07:11 -07:00
snipe	c90ed9f25f	Allow models uploads Signed-off-by: snipe <snipe@snipe.net>	2022-06-28 15:50:07 -07:00
snipe	d8d12d4590	Merge pull request #11408 from uberbrady/add_filter_option_to_ldap_sync Add a new `--filter` option to Artisan ldap-sync command	2022-06-28 09:50:48 -07:00
Brady Wetherington	be3388d647	Add a new `--filter` option to Artisan ldap-sync command	2022-06-27 19:49:59 -07:00
snipe	94e723a88f	Merge pull request #11404 from snipe/features/fix_transliteration Fixed custom field transliteration	2022-06-27 17:42:02 -07:00
snipe	14d8fb66aa	Merge pull request #11405 from snipe/fixes/use_db_column_instead_of_converted_value Only care about the custom field's converted name when updating the custom field itself	2022-06-27 17:36:26 -07:00
snipe	bf08e73f8f	Removed comments and server side cookie info Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 16:36:09 -07:00
snipe	52bd7d0d68	Merge remote-tracking branch 'origin/develop'	2022-06-27 14:25:38 -07:00
snipe	baad3b9d58	Only care about the converted name when updating the custom field itself Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 14:17:07 -07:00
snipe	131edb611e	Refine output and checks Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 13:54:21 -07:00
snipe	bee694e605	Fixed typo Signed-off-by: snipe <snipe@snipe.net>	2022-06-27 09:57:20 -07:00
snipe	d70b36750c	Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset Fixes #8155 - improve the workflow during asset creation	2022-06-24 18:53:07 -07:00
snipe	8c85d7bc97	Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating Adds validation to custom fields' default values	2022-06-24 18:11:16 -07:00
snipe	d167d2a10f	Disallow backup deletion and log attempt if not allowed Signed-off-by: snipe <snipe@snipe.net>	2022-06-24 15:49:22 -07:00
snipe	77bf28bcb6	Disallow purge Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 20:11:43 -07:00
snipe	86d2c2b153	Small naming changes Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:11:59 -07:00
snipe	f0cc418965	Merge pull request #11383 from snipe/features/adds_user_id_to_users Added created_by to users	2022-06-23 18:48:42 -07:00
snipe	0bc3ca5c42	Fixed comments Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:44:27 -07:00
snipe	9fd3541520	Missed on createdBy Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:42:22 -07:00
snipe	3e559044b2	Changed method and scope names Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:41:13 -07:00
snipe	1c25057e42	Merge pull request #11379 from Godmartinz/license_acceptance_eula adds eula blade for licenses/consumables/components and fixes assigned_to for dom_pdf	2022-06-23 18:26:19 -07:00
snipe	9c9f5be6fe	Do not show the creating admin by default in list view Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:28:34 -07:00
snipe	d8daec2e0a	Added created_by results to user index API Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:19:30 -07:00
snipe	c9b81d65f1	Save the user id who is creating the user Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:19:08 -07:00
snipe	7f05029089	Added created_by to API output Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:18:31 -07:00
snipe	23c50ea9a5	Added admihn scopes Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:18:11 -07:00
snipe	2e5e8f363b	Added admin to oresenter Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:18:04 -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
Godfrey M	b0897a1fc9	adds acceptance for consumables and components	2022-06-23 11:52:35 -07:00
Godfrey M	d00b469001	fixed the search for the license	2022-06-23 11:33:36 -07:00
Godfrey M	df76e6eacf	adds eula blade for licenses and fixes assigned_to for dom_pdf	2022-06-23 11:15:15 -07:00
Ivan Nieto Vivanco	7976401aa2	Add error message when the default customfield values can't be validated	2022-06-22 22:17:05 -05:00
Ivan Nieto Vivanco	321367b974	Adds validation to custom fields' default values	2022-06-22 21:06:07 -05:00
snipe	89c234b1c2	Merge pull request #11358 from snipe/fixes/missing_token_lang Fixed missing password.token string and checked for user existing before attempting to send reset email	2022-06-22 11:15:08 -07:00
snipe	135fdae209	Merge pull request #11337 from mikeroq/fixes/user_edit_website_missing Fixed #11332 Added website field that was missing from update and store method.	2022-06-22 10:16:38 -07:00
snipe	a7dc6162fa	Simplify password attempts rate limiting Signed-off-by: snipe <snipe@snipe.net>	2022-06-22 09:11:24 -07:00
snipe	1c1f3dc42c	Added password requests cleanup to scheduler Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 19:35:16 -07:00
snipe	a5b857c753	Return error if token is incorrect Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 19:30:51 -07:00
snipe	a31bca1798	Check that the user is activated before letting them reset their password Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 18:48:02 -07:00
snipe	7f8fc7add9	Make SAML debugging less noisy Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 17:57:17 -07:00
snipe	6bc525bc25	Merge pull request #11352 from inietov/fixes/assets_transformer_date_customfields_fixes Fixed #11335 Assets transformer date customfields issues	2022-06-21 17:56:17 -07:00
snipe	f4f400ed87	Handle workflow better for invalid users Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 16:13:43 -07:00
snipe	a49ccf0863	Removed unused rules Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 16:13:26 -07:00
snipe	300879847f	Added a few comments to make it clearer what’s happening Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 14:33:10 -07:00
snipe	21875100b6	Fixed missing password.token string and checked for user existing before trying to reset Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 14:15:38 -07:00
snipe	675f42401c	Fixed #11343 - ability to null asset name Signed-off-by: snipe <snipe@snipe.net>	2022-06-21 10:57:39 -07:00
Ivan Nieto Vivanco	3a5c09c424	Used the getFormattedDateObject() function with the expected parameters	2022-06-20 19:58:51 -05:00
mikeroq	d60af478ad	Added website field that was missing from update and store method.	2022-06-17 08:09:39 -05:00
Mike Roquemore	8a27ef30d5	Missing total argument on transformDeprecations method Removed duplicate array key on transformDeprecation method	2022-06-15 21:52:15 -05:00
snipe	af66f83a3d	Check for blank (not null) values i asset transformer date Signed-off-by: snipe <snipe@snipe.net>	2022-06-15 13:42:30 -07:00
snipe	74bc06cc49	Removed debugging code Signed-off-by: snipe <snipe@snipe.net>	2022-06-15 02:07:58 -07:00
snipe	07bc2fd742	Added maintenance scope for ordering by supplier Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:11:43 -07:00
snipe	a57a6486e7	Only add http:// if the url variable isn’t blank Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:11:13 -07:00
snipe	a33276cb3d	Additional filters on maintenances UI Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 16:10:48 -07:00
snipe	954b54f914	Removed duplicated $allowed_columns Signed-off-by: snipe <snipe@snipe.net>	2022-06-14 15:06:04 -07:00
snipe	bff34063cd	Merge pull request #11309 from uberbrady/ldap_troubleshooter_improvements Fixed SC-19104 - fixes to ldap:troubleshoot artisan command	2022-06-14 12:24:24 -07:00
Brady Wetherington	1e685ca835	Fixed SC-19104 - fixes to ldap:troubleshoot artisan command	2022-06-14 12:18:42 -07:00
snipe	c3b644797e	Merge pull request #11169 from inietov/fixes/user_update_from_import_location_in_assets Fixes Asset location doesn't change when assigned user's location change via importer	2022-06-14 11:44:26 -07:00
Ivan Nieto Vivanco	50c008ead5	Adds check in condition that format custom dates	2022-06-14 01:37:15 -05:00
snipe	dd9c9520fb	Correctly filter by category_id Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 20:42:21 -07:00
snipe	92bb8fac32	Removed log statement Signed-off-by: snipe <snipe@snipe.net>	2022-06-13 19:49:14 -07:00
snipe	20a0c4e3b5	Merge pull request #11272 from inietov/fixes/date_localization_in_customfields Fixes #8143 Date localization not working on custom fields	2022-06-13 19:47:20 -07:00
snipe	0153a37cd7	Merge pull request #11264 from snipe/fixes/set_default_ldap_version Fixed default ldap version if not specified	2022-06-13 17:14:57 -07:00
snipe	4c11041477	Fixed regression: missing restore option for assets via API Signed-off-by: snipe <snipe@snipe.net>	2022-06-09 17:17:38 -07:00
Ivan Nieto Vivanco	f8718ffc1e	Fixes observer fails when creating and assigning asset	2022-06-09 18:08:04 -05:00
Ivan Nieto Vivanco	0c3972d7b7	Add spaces to the code for consistency	2022-06-09 13:02:31 -05:00
Ivan Nieto Vivanco	4a0eb2b3f1	Add element type of customfield to API response	2022-06-09 12:57:20 -05:00
snipe	728338bfa8	Merge pull request #10824 from inietov/fixes/accessories_consumables_negative_numbers_develop Fixes Accessories total quantity shows a negative number for develop branch	2022-06-08 10:53:57 -07:00
Ivan Nieto Vivanco	740f27198f	Evaluate if a custom field is a Date to present it with the correct format	2022-06-07 18:00:46 -05:00
snipe	5458676ead	Default to v3 of LDAP on settings save Signed-off-by: snipe <snipe@snipe.net>	2022-06-06 21:00:22 -07:00
snipe	8337628323	Set elvis operator to ensure ldap version is 3 if null Signed-off-by: snipe <snipe@snipe.net>	2022-06-06 20:57:18 -07:00
snipe	7faaa4ce24	Merge pull request #11263 from inietov/fixes/dont_save_update_action_if_nothings_changed Fixes log update action even if no changes are made to assets [sc-19131]	2022-06-06 20:06:19 -07:00
snipe	e0102ddbf0	Fixes #11093 Return true/false for custom fields/fieldsets required in API Signed-off-by: snipe <snipe@snipe.net>	2022-06-06 20:03:20 -07:00
Ivan Nieto Vivanco	1030ad9a27	Early returns if no change is made in the Asset so the 'update' action doesn't log	2022-06-06 22:00:05 -05:00
snipe	8333c80b7a	Added address2 to column selector for locations listing Signed-off-by: snipe <snipe@snipe.net>	2022-06-06 19:31:08 -07:00
Ivan Nieto Vivanco	f977c53ecb	Fixes some issues in the asset observer	2022-06-06 19:14:32 -05:00
snipe	7c77e03c5a	Initial rework of locations display Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 18:08:15 -07:00
snipe	133da6569b	Merge pull request #11252 from snipe/fixes/locations_improvements Fixes/locations improvements	2022-06-05 17:05:25 -07:00
snipe	dba06a3a9e	Check for valid location before trying to print Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 16:56:15 -07:00
snipe	07b1062fb2	Better handle API calls to nonexistent users Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 16:55:23 -07:00
snipe	d31f185cce	Display the actual value Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 15:36:52 -07:00
snipe	5901182885	Removed stray character Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 15:30:34 -07:00
snipe	f033aeda83	Fixed typo in comments Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 15:28:00 -07:00
snipe	53f9e2bc7a	Wrap the Carbon method in a try/catch to prevent crashing on bad data Signed-off-by: snipe <snipe@snipe.net>	2022-06-03 15:25:39 -07:00
snipe	910fc08406	Dropped log level to warn on SAML error Signed-off-by: snipe <snipe@snipe.net>	2022-06-02 17:07:49 -07:00
Achmad Fienan Rahardianto	fe65de1207	implements cookie to maintain display preference	2022-06-01 11:54:05 +07:00
Ivan Nieto Vivanco	eb34cf7917	Evaluates if logo is uploaded before export PDF	2022-05-31 15:59:01 -05:00
Ivan Nieto Vivanco	37f9cca5ec	Minor stylistic change	2022-05-28 08:11:13 -05:00
Ivan Nieto Vivanco	e0050bc844	Don't let a license to be checked out to a non-existent target	2022-05-26 18:06:53 -05:00
Ivan Nieto Vivanco	1f6ab340a6	Give a more descriptive name to variable	2022-05-25 18:53:17 -05:00
Ivan Nieto Vivanco	f208869aff	Add column to show filenames in Activity Report if the log action is 'uploaded'	2022-05-25 18:50:32 -05:00
Brady Wetherington	8fdedf9441	Downgraded/Removed log statements	2022-05-24 19:30:22 -07:00
Ivan Nieto Vivanco	e0b64a4879	Fixes constraint violation when ordering some columns	2022-05-24 14:00:23 -05:00
Brady Wetherington	5130a86854	Google client-side TLS auth works better with null as context(?)	2022-05-23 20:31:43 -07:00
snipe	8333089278	Merge pull request #11172 from snipe/rebased_added_gitkeep_to_to_eula_pdfs Accept asset/accessory improvements and fixes	2022-05-23 12:59:01 -07:00
snipe	70344cc02e	Merge pull request #11149 from Godmartinz/gh11129_setting_disclosure_arrow Fixed #11129 - settings treeview won't stay active.	2022-05-23 12:55:11 -07:00
Godfrey M	160a147a58	removed line breaks and deadspace	2022-05-23 09:35:19 -07:00
snipe	bd384d3f10	Small formatting fixes Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	ad8143b0bd	Added comments Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	625f120813	Removed unused cases Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	b7eb72fe49	Rough refactor of the acceptance controller Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	afb3843fad	Added sig and filename to acceptedCheckout method Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	8e85d316c9	Removed stored_eula_file from API transformer Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	ebd3c11129	Added singleton Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	75acb0f28a	Added sig and eula pdf to checkout_acceptance Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	eb5f33e815	Removed logging statement Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	adbac82c30	Removed stored_eula_file from actionlog Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	e467ce912b	Added some debugging and comments Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	4eab5fd075	Removed older comments Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	d0e8a4ca09	Added some comments for clarity Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
snipe	266a9e5328	Removed stored_eula_file from controller Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
Ivan Nieto Vivanco	52901f50eb	Add date to checkout action when importing assets	2022-05-19 17:38:10 -05:00
Ivan Nieto Vivanco	340c59969c	Add query to update assigned assets location when importing users	2022-05-19 13:34:50 -05:00
Ivan Nieto Vivanco	5d29f77d60	Initialize result variable so return don't crash	2022-05-19 12:47:12 -05:00
snipe	4669bb54fe	Small fixes for asset tag regeneration script Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 17:14:22 -07:00
snipe	f609146c29	Corrected field name Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 15:37:10 -07:00
snipe	891009dc67	Nicer formatting for buttons in bulk user edit Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 15:35:57 -07:00
snipe	014a32b050	Run migrations after restore Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 14:12:17 -07:00
Godfrey M	23891054dc	removed dead space and unused namespace	2022-05-18 13:11:20 -07:00
Godfrey M	cfc4c58da3	fixes the Settings Tree menu to remain active when opened	2022-05-18 13:06:06 -07:00
Ivan Nieto Vivanco	1453b36484	Add filter to only get Assets for the unaccepted assets report	2022-05-18 14:46:48 -05:00
Ivan Nieto Vivanco	32111a863b	Call User::generateFormattedNameFromFullName() in the UserImporter	2022-05-18 13:02:44 -05:00
snipe	b7b21689f2	Merge remote-tracking branch 'origin/develop'	2022-05-18 04:25:23 -07:00
Ivan Nieto Vivanco	a771984619	Add an early return if for some reason the import record is not found	2022-05-18 06:15:46 -05:00
snipe	71828d5461	One more trim…. sigh.. Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 03:53:42 -07:00
snipe	d9817ec696	Added a trim Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 03:51:53 -07:00
snipe	33ded3f18a	More debugging Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 03:48:09 -07:00
snipe	004d567253	Added some debugging Signed-off-by: snipe <snipe@snipe.net>	2022-05-18 03:31:00 -07:00
Brady Wetherington	b4a0d33ba8	Reduce logging further; we know the main error condition now	2022-05-17 19:57:42 -07:00
Brady Wetherington	4e65a8d755	Reduce SAML debugging output to actual error conditions	2022-05-17 19:54:14 -07:00
snipe	11db243514	Merge pull request #11135 from uberbrady/improve_restore_erroring Do some better erroring if you can't launch the mysql binary	2022-05-17 18:16:40 -07:00
Brady Wetherington	d391980b06	Do some better erroring if you can't launch the mysql binary	2022-05-17 17:01:23 -07:00
snipe	a8eb138ae0	Merge pull request #11133 from inietov/fixes/backup_createdat_time_incorrect Fixes #11096 Backup created_at time is incorrect	2022-05-17 14:39:19 -07:00
Ivan Nieto Vivanco	72493d54aa	Show the date and time as the user select in their settings	2022-05-17 16:36:05 -05:00
Ivan Nieto Vivanco	91c7a89f93	Change to use the date() function instead of Helper::getFormattedDateObject()	2022-05-17 16:24:52 -05:00
snipe	11f540daaf	Added debug line Signed-off-by: snipe <snipe@snipe.net>	2022-05-17 09:41:35 -07:00
snipe	0dfc98a493	Force db:wipe Signed-off-by: snipe <snipe@snipe.net>	2022-05-17 04:27:48 -07:00
snipe	7a1b17ff6a	Backslash log:: (we shouldn’t have to do this tho?) Signed-off-by: snipe <snipe@snipe.net>	2022-05-16 15:59:41 -07:00
snipe	d4f7b5f80c	Fixed #11100 for individual users Signed-off-by: snipe <snipe@snipe.net>	2022-05-16 12:07:18 -07:00
snipe	64b582c657	Merge pull request #11108 from uberbrady/fix_ldap_first_login_password Pass the password along directly instead of retrieving it from the In…	2022-05-16 11:01:35 -07:00
Brady Wetherington	6c86a28d18	Pass the password along directly instead of retrieving it from the Input or Request	2022-05-16 10:58:27 -07:00
Brady Wetherington	b05d85ab0a	Fix bulk-user reset-password links	2022-05-16 10:38:12 -07:00
snipe	1c32dcae9f	Add login note to demo resetter Signed-off-by: snipe <snipe@snipe.net>	2022-05-15 10:20:03 -07:00
Brady Wetherington	f608e4586c	Only set manager ID when the lookup succeeds.	2022-05-15 09:25:28 -07:00
Johnson Yi	4401dab8d6	fix saml slo for logout	2022-05-14 11:59:34 +00:00
snipe	3a31104b5c	Fixed #11052 - add file sizes to upload displays Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 19:33:14 -07:00
snipe	333aa05809	Added missing use statement Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 16:46:13 -07:00
snipe	c5ec3efc70	Merge pull request #11065 from snipe/fixes/double_encoding_for_custom_fields Fixed #11014 - double encoding for custom fields	2022-05-13 16:12:24 -07:00
Brady Wetherington	0ddb0f2c81	Switch the barcode backend to SVG, and fix the two-factor middleware	2022-05-13 14:22:27 -07:00
snipe	6fc222a648	Fixed #11014 - Removed double escaping on custom fields Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 05:45:00 -07:00
snipe	deb2d958d8	Sets maxlength of user fields to 191 Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 04:54:12 -07:00
snipe	ef1eb15a91	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # config/permissions.php	2022-05-12 09:31:42 -07:00
snipe	c52faaf23d	Added checkout to permissions check Signed-off-by: snipe <snipe@snipe.net>	2022-05-11 19:02:23 -07:00
snipe	446e44deb6	Merge pull request #11048 from Godmartinz/bug/sc-18989/purchase-cost-can-be-negative Fixed validation for purchase cost allowed to be negative	2022-05-10 17:36:01 -07:00
snipe	780222d372	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Auth/LoginController.php # resources/views/users/print.blade.php	2022-05-10 17:26:26 -07:00
Godfrey M	2c1f368828	adds validation for all purchase costs variables	2022-05-10 16:26:06 -07:00
Godfrey M	33b1ab3658	prevents values for assets being negative through validation	2022-05-10 16:19:06 -07:00
snipe	f4650c65db	Clearer phrasing for log Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 13:00:48 -07:00
snipe	d3830a44d8	Added more verbose messaging Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:40:50 -07:00
snipe	5869b6ed0c	And still more debugging Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:38:46 -07:00
snipe	4fccf4ddc4	Few more log lines Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:27:42 -07:00
snipe	646166b2b6	Removed debug line Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:16:07 -07:00
snipe	f4e737eaf3	More SAML debugging Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:14:22 -07:00
snipe	f572eaa421	Added debugging for SAML login Signed-off-by: snipe <snipe@snipe.net>	2022-05-10 12:07:07 -07:00
snipe	dc8669121d	Added license seat ID to the UI Signed-off-by: snipe <snipe@snipe.net>	2022-05-09 10:59:06 -07:00
snipe	dfd4d54433	Fixed route name Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 15:46:25 -07:00
snipe	220f94faee	Check that the session key exists Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 14:10:47 -07:00
snipe	22ec3c1398	Use error style instead of warn/info when nothing was selected Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:41:52 -07:00
snipe	caf17d4f25	Fixed wrong variable name Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:41:32 -07:00
snipe	e1b24bb763	Added a comment Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:30:21 -07:00
snipe	adc017db23	Added checkbox to audit listing Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:16:13 -07:00
snipe	76213ec3d9	Create a session on bulk actions, store it for redirect, then delete it Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:14:08 -07:00
snipe	243739e9c3	Added missing gate for bulk checkout Signed-off-by: snipe <snipe@snipe.net>	2022-05-06 05:13:36 -07:00
snipe	784bf4d784	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .github/ISSUE_TEMPLATE/feature_request.yml # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ReportsController.php # config/version.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/views/users/print.blade.php # webpack.mix.js	2022-05-06 01:52:43 -07:00
snipe	b20921cb62	Removed duplicate session regenerate Signed-off-by: snipe <snipe@snipe.net>	2022-05-05 21:35:05 -07:00
snipe	0939591efb	Merge pull request #11003 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null_develop Fixes QueryException Integrity constraint violation: Column 'order' cannot be null for develop	2022-05-05 13:28:00 -07:00
snipe	a859eac4a0	Merge pull request #11002 from inietov/fixes/integrity_constraint_violation_column_order_cannot_be_null Fixes QueryException Integrity constraint violation: Column 'order' cannot be null	2022-05-05 13:27:45 -07:00
snipe	953b3a8d6e	Merge pull request #10993 from snipe/rcs/merge_master_into_develop_for_rc_8 Merge master into develop for RC 6.0.0-8	2022-05-05 10:53:17 -07:00
snipe	5c78a15835	Removed dupe lines from merge conflict Signed-off-by: snipe <snipe@snipe.net>	2022-05-03 12:56:29 -07:00
Ivan Nieto Vivanco	37805509da	Adds an integer casting to the order input field so it cannot be null	2022-05-01 15:27:05 -05:00
Ivan Nieto Vivanco	01232d9a54	Adds an integer casting to the order input field so it cannot be null	2022-05-01 15:16:56 -05:00
Ivan Nieto Vivanco	ac8da55270	Evaluate if an item still exists before trying to get its name in the report	2022-05-01 13:25:55 -05:00
Ivan Nieto Vivanco	1cbbf8f976	Evaluate if an item still exists before trying to get its name in the report	2022-05-01 13:11:05 -05:00
Johnson Yi	92fe1287ea	Do not saml login automatically after normal logout	2022-04-29 15:35:08 +00:00
snipe	9aac1cbba4	Merge branch 'master' into rcs/merge_master_into_develop_for_rc_8 Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/MoveUploadsToNewDisk.php # app/Http/Controllers/ActionlogController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Assets/AssetCheckinController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/BulkUsersController.php # app/Http/Requests/AssetCheckoutRequest.php # app/Importer/LicenseImporter.php # app/Models/Actionlog.php # app/Models/License.php # app/Models/User.php # app/Observers/AssetObserver.php # composer.lock # config/version.php # database/factories/LicenseFactory.php # database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php # database/migrations/2018_10_18_191228_add_kits_licenses_table.php # database/migrations/2018_10_19_153910_add_kits_table.php # database/migrations/2018_10_19_154013_add_kits_models_table.php # database/migrations/2019_02_07_185953_add_kits_consumables_table.php # database/migrations/2019_02_07_190030_add_kits_accessories_table.php # package-lock.json # package.json # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/ar/general.php # resources/lang/ar/passwords.php # resources/lang/cs/general.php # resources/lang/cs/passwords.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/fr/admin/custom_fields/general.php # resources/lang/fr/admin/hardware/general.php # resources/lang/fr/admin/locations/table.php # resources/lang/fr/admin/settings/message.php # resources/lang/hu/admin/custom_fields/general.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/general.php # resources/lang/it/admin/settings/general.php # resources/lang/nl/admin/custom_fields/general.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/sv-SE/passwords.php # resources/lang/tr/general.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/reports/activity.blade.php # resources/views/users/print.blade.php	2022-04-28 17:49:06 +01:00
snipe	2e9cf8fa87	Added access gate to the requested assets index Signed-off-by: snipe <snipe@snipe.net>	2022-04-28 15:45:37 +01:00
snipe	f623d05d0c	Escape checkout target name Signed-off-by: snipe <snipe@snipe.net>	2022-04-24 15:27:11 +01:00
Godfrey M	91694064fb	fixes double updates from action log and history	2022-04-18 11:30:24 -07:00
snipe	b2087a9947	Adds validator to make sure the status ID is deployable Signed-off-by: snipe <snipe@snipe.net>	2022-04-15 13:06:55 +01:00
snipe	6b1329133b	Adds status ID to asset checkout API endpoint Signed-off-by: snipe <snipe@snipe.net>	2022-04-15 13:06:35 +01:00
snipe	698c7f4904	Fixes potential XSS vuln in user requestable results Signed-off-by: snipe <snipe@snipe.net>	2022-04-15 12:22:20 +01:00
snipe	1441cf9f4f	Ports #10494 to master Signed-off-by: snipe <snipe@snipe.net>	2022-04-12 21:04:57 +01:00
snipe	7b891f0952	Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations Fixes Bulk user edit not updating checked out asset locations	2022-04-07 19:41:01 +01:00
snipe	8218b5ef47	Merge pull request #10914 from inietov/fixes/bulk_user_edit_not_updating_asset_locations_develop Fixes Bulk user edit not updating checked out asset locations	2022-04-07 19:40:42 +01:00
snipe	b73542664b	Merge pull request #10919 from Godmartinz/gh10866-checkin_time_always_show_12am Fixed #10866 - Checkin time always shows 12am	2022-04-07 19:40:11 +01:00
Godfrey M	3eb7a87a66	fixes action_date for check-in not including H:i:s	2022-04-07 11:24:12 -07:00
Godfrey M	1325628039	fixes typo	2022-04-07 11:18:16 -07:00
Godfrey M	8498082f21	fixes typo	2022-04-07 11:16:40 -07:00
Godfrey M	6dc45c189b	removed deadspace	2022-04-07 11:10:36 -07:00
Godfrey M	5d0a1ebb7a	fixes action_date for check-in not including H:i:s	2022-04-07 11:08:43 -07:00
Ivan Nieto Vivanco	e1927aa154	Update Assets locations when user's location changes whey they got bulk-edited	2022-04-06 19:23:49 -05:00
Ivan Nieto Vivanco	6529a75683	Update Assets locations when user's location changes whey they got bulk-edited	2022-04-06 19:12:02 -05:00
snipe	01342ca266	Fixed activity report Signed-off-by: snipe <snipe@snipe.net>	2022-04-05 22:58:25 +01:00
Ivan Nieto Vivanco	b5378eff64	Fix several typos	2022-04-05 16:12:31 -05:00
snipe	8195a664a9	Merge pull request #10883 from inietov/fixes/update_existing_value_import_develop Fixes Importer always update existing values develop	2022-04-05 21:11:24 +01:00
Brady Wetherington	6756dd193e	SCIM integration using the 're-do-the routes' approach, which seems like a dead-end Cleaning up routes to match laravel-scim-server's recommended implementation Some actually working changes for SCIM support?! Whoops, forgot my route file Fix public SCIM routes Removed Ziggy, removed old generated file, yanked Ziggy references Resolves the first set of comments for SCIM Ensure all /api routes have baseUrl prepended Fix the parent:: call to be, uh, actually correct :P Clarify the route-ordering, as it is quite tricky This gets it so that users can actually be saved.. Work around the lack of callbacks with some inheritance Mapped a bunch more fields from SCIM into Snipe-IT's user table More baseUrl shenanigans since we yanked Ziggy :/ Properly map job title and work with some other necessary attributes Map more fields... Finalized basic mapping for core and enterprise namespaces Latest tuned settings for SCIM config to work with Azure (and others)	2022-04-05 20:26:37 +01:00
Ivan Nieto Vivanco	2d213a9c77	Make the report take the dates of pivot table instead of asset log	2022-04-05 12:57:49 -05:00
snipe	08588a2e6a	Merge pull request #10901 from veenone/fix/invalid_consumable_date_in_user_view Fixes #10898 (invalid consumable date time info in user view)	2022-04-05 18:30:23 +01:00
Achmad Fienan Rahardianto	231a34ace3	FIX: #10898 (invalid consumable date time info in user view)	2022-04-05 15:31:27 +07:00
Ivan Nieto Vivanco	1a448cc4b6	Take the values from the importer form to configure the used importer	2022-03-29 17:31:43 -06:00
snipe	a937bd34f6	Merge master back down into develop Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:28:43 +01:00
snipe	bdabbbd4e9	Logout user when their activated status is switched to off Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 13:44:53 +01:00
snipe	7941a88623	Merge pull request #10817 from dampfklon/fix-10810-unaccepted-assets Fix #10810 unaccepted assets	2022-03-29 12:10:37 +01:00
snipe	b5f3a357e2	Merge pull request #10850 from Godmartinz/feature/sc-18937/add-manager-to-ldap-sync This looks good, thanks!	2022-03-29 12:06:01 +01:00
Yevhenii Huzii	863ea62551	Fix problem with static paths	2022-03-27 23:12:38 +03:00
snipe	639409fb3f	Backporting #10829 to master Signed-off-by: snipe <snipe@snipe.net>	2022-03-25 13:00:16 +00:00
snipe	e207a5043e	Merge pull request #10737 from Godmartinz/feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf Fixed #7891, #3019 and #8260 [sc-15014] - added asset acceptance and signed eula as pdf	2022-03-24 20:52:41 +00:00
Godfrey M	a1429ce86b	removed manager_name from user files	2022-03-24 11:47:13 -07:00
Godfrey M	c1f8252388	adds manager field to LDAP sync	2022-03-24 11:24:39 -07:00
andreaci	ff5a95a6a4	next_audit_date error on saving asset Solved error 500 when saving new Asset and no next_audit_date is defined	2022-03-23 17:23:53 +01:00
Godfrey M	55680762de	Merge branch 'develop' into feature/sc-18937/add-manager-to-ldap-sync	2022-03-22 16:33:58 -07:00
snipe	20e65804ef	Removed comment Signed-off-by: snipe <snipe@snipe.net>	2022-03-22 18:12:08 +00:00
Godfrey Martinez	fe6a6740db	Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf	2022-03-22 10:10:56 -07:00
Godfrey M	3e01981576	clean up	2022-03-22 10:07:08 -07:00
Godfrey M	62352ef1a1	completes accessory eula agreement blade	2022-03-22 10:04:22 -07:00
Ivan Nieto Vivanco	98b78837e1	Validate custom fieldset only if the asset have one	2022-03-22 09:38:57 -06:00
snipe	8c92198636	Possible fix for boolean field check Signed-off-by: snipe <snipe@snipe.net>	2022-03-22 13:47:43 +00:00
Ivan Nieto Vivanco	7571c0b850	Add support for boolean type customfields	2022-03-21 18:48:42 -06:00
Ivan Nieto Vivanco	319d816002	Update in the license seat the user that the asset with that license have assigned	2022-03-21 15:06:43 -06:00
Godfrey M	4956eb0410	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07:00
Godfrey M	220df9710e	adds most of the fields for an accessory eula agreement pdf	2022-03-21 09:18:29 -07:00
snipe	df60729140	Fixed #10769 - redirect user back to due for audit page This could probably take a little reworking, since if you are auditing from the Overdue for Audit page, we’d want to take you back there instead of the Due for Audit page. Signed-off-by: snipe <snipe@snipe.net>	2022-03-21 14:27:18 +00:00
snipe	e04ae63d02	Apply the fix to API controller too :( Signed-off-by: snipe <snipe@snipe.net>	2022-03-19 23:12:48 +00:00
snipe	7db252ade3	Fixed #10840 - defaulting to 0 on supplier ID if no value provided Signed-off-by: snipe <snipe@snipe.net>	2022-03-19 23:11:42 +00:00
snipe	42220cc566	Merge pull request #10809 from inietov/fixes/customfields_boolean_format_not_saving Fixes Customfields with boolean format not saving [ch-9973]	2022-03-19 22:10:54 +00:00
Godfrey M	b2e78e3382	formats most of the pdf blade	2022-03-16 15:53:32 -07:00
Dampfklon	9818d16834	fix showDeletedFunction by reverting #9508	2022-03-16 20:20:46 +01:00
Godfrey M	5fcc3c39f3	routes eula agreements for download correctly to the asset history	2022-03-16 11:56:56 -07:00
snipe	0f95802699	Fixed mis-automerge Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 18:05:47 +00:00
snipe	9db8bd782d	Merging master down into develop Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 18:02:07 +00:00
Godfrey M	6386fa1c5e	clean up	2022-03-16 09:54:10 -07:00
snipe	89ddbddada	Fixed comment Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:53:18 +00:00
snipe	7498fe36e9	Removed extra space because pedantry Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:45:03 +00:00
snipe	babf7c064b	Added ability to filter status label index endpoint by status type Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:38:45 +00:00
Ivan Nieto Vivanco	570dd09dcd	Add validation to Accessories and Consumables to not let the user update the number of items to less than they already have checked out	2022-03-15 17:52:19 -06:00
Godfrey M	b2f7262cd2	adds table structure for asset history	2022-03-14 19:38:36 -07:00
snipe	1ac293a12a	Add a force override Signed-off-by: snipe <snipe@snipe.net>	2022-03-10 13:30:03 -08:00
snipe	3e3c277a3f	Better phrasing Signed-off-by: snipe <snipe@snipe.net>	2022-03-10 13:29:52 -08:00
snipe	93d6ce1a6a	Added session killer artisan command Signed-off-by: snipe <snipe@snipe.net>	2022-03-10 13:20:23 -08:00
Godfrey M	e1a6a2afc6	adds translation for accept_eula, a bit more logic on the Acceptance Controller that is not working yet	2022-03-10 12:15:50 -08:00
Ivan Nieto Vivanco	cdc0805fc4	Sanitize dates input in the importer before saving	2022-03-10 12:07:07 -06:00
Ivan Nieto Vivanco	9caf27ce60	Sanitize dates input in the importer before saving	2022-03-10 11:48: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
snipe	e3d2f7cc96	Missed a few Signed-off-by: snipe <snipe@snipe.net>	2022-03-08 20:05:17 -08:00
snipe	d1358b6249	Removed experimental feature policies Signed-off-by: snipe <snipe@snipe.net>	2022-03-08 16:58:24 -08:00
Godfrey M	59c583ac74	adds the ability to save eula pdfs to storage, still working on storing them in the DB and exposing them in the UI	2022-03-08 16:42:27 -08:00
Brady Wetherington	ab7bf3c5d4	Get rid of stale commented-out line	2022-03-07 20:22:23 -08:00
Brady Wetherington	0556c7653a	Implement a generic timeout function, and run methods that need to run with a timeout using it.	2022-03-07 19:51:21 -08:00
Brady Wetherington	b96303cb38	Clean up errors, add new required package to Dockerfile	2022-03-07 19:51:21 -08:00
Brady Wetherington	312a90ce77	Add start of Tracing to LDAP troubleshooter	2022-03-07 19:51:21 -08:00
Brady Wetherington	71b5c0e80f	Add new LDAP troubleshoot ldapsearch subcommand, broaden out troubleshooting	2022-03-07 19:51:21 -08:00
Brady Wetherington	519bd00bef	WIP - just need to get authed connections to work	2022-03-07 19:51:21 -08:00
Brady Wetherington	ffd8f583b4	Got most of the stages working for the LDAP troubleshooter	2022-03-07 19:51:21 -08:00
Brady Wetherington	8cd5ec6799	Most of the host-port-tls discovery stuff is in-place now	2022-03-07 19:51:20 -08:00
Brady Wetherington	ef0e9a3c93	WIP: Enhancing stage 2 of LDAP troubleshooter	2022-03-07 19:51:20 -08:00
Brady Wetherington	8aa975e959	First pass at Artisan-based LDAP troubleshooter	2022-03-07 19:51:20 -08:00
snipe	e9d297e97d	Added cache comment Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 19:37:06 -08:00
snipe	9269d5945e	Added QR and alt barcode urls to asset transformer Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 19:32:18 -08:00
snipe	3e2fe10480	Fixed getAssetBySerial Signed-off-by: snipe <snipe@snipe.net>	2022-03-05 09:03:29 -08:00
snipe	2d7a8b5e15	Merge pull request #10776 from snipe/added_trim_to_email_and_username Added trim to email and username	2022-03-04 11:57:33 -08:00
snipe	9a358087ec	Add remote user to bulk edit Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:47:23 -08:00
snipe	b6a1d245e8	Added trim to CC email as well Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:20:34 -08:00
snipe	67134ca387	Do a trim() before inserting/updating Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 06:18:52 -08:00
snipe	0dfc27f56e	Added remote to allowed_columns for sorting Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:44:46 -08:00
snipe	43c1949092	Add remote option to user Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:35:26 -08:00
snipe	f840652395	Suppress errors for missing signatures Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 03:18:28 -08:00
snipe	67ed0d91c0	Handle file_get_contents more gracefully Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 02:54:37 -08:00
snipe	b876d0abb0	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .env.example # app/Http/Controllers/Auth/LoginController.php # app/Http/Kernel.php # app/Http/Transformers/ActionlogsTransformer.php # app/Importer/AssetImporter.php # app/Models/Accessory.php # app/Models/Consumable.php # app/Presenters/AccessoryPresenter.php # app/Presenters/ComponentPresenter.php # app/Presenters/ConsumablePresenter.php # app/Providers/AuthServiceProvider.php # composer.json # composer.lock # config/app.php # config/cors.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/build/app.js.LICENSE.txt # public/js/dist/all.js # public/mix-manifest.json # resources/views/accessories/view.blade.php # resources/views/consumables/view.blade.php # resources/views/settings/saml.blade.php # routes/api.php	2022-03-03 21:59:38 -08:00
snipe	29a2e80984	Merge pull request #10771 from uberbrady/retry_fix_bad_metadata_display Retry fix bad metadata display	2022-03-03 20:49:30 -08:00
snipe	94dded3785	Added notes field to presenters for table view show/hide columns Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:30:07 -08:00
snipe	ac8a7d0bc9	Made notes field fillable and searchable Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:29:48 -08:00
snipe	6fca8350f9	Added notes field to transformers Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:29:35 -08:00
snipe	9acb5413f6	Added notes field to controllers Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:29:25 -08:00
snipe	08a2fe4edb	Merge pull request #10773 from snipe/features/adds_ldap_import_and_assets_count_to_user_api Features/adds ldap import and assets count to user api	2022-03-03 19:15:14 -08:00
snipe	6abe8f296b	We don’t need the users table here Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 19:12:03 -08:00
snipe	a53a67be4a	Added consumables, licenses, accessories count filters too Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 19:08:08 -08:00
snipe	b72cac3511	Adds ldap_import and assets_count filter to user API endpoint Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 19:03:35 -08:00
snipe	c940d36fff	Updated maintenance gate in API Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 18:49:54 -08:00
snipe	cd12028845	Use “update” instead of edit in gate Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 18:47:20 -08:00
Brady Wetherington	3225605ef3	Handling the old weirdly-formatted data wasn't quite working.	2022-03-03 18:17:29 -08:00
Brady Wetherington	31dde20a2b	Actually, re-introduce this code comment as it's still relevant and tricky	2022-03-03 15:48:04 -08:00
Brady Wetherington	aa36ebc947	Merge branch 'fix_bad_metadata_display' into retry_fix_bad_metadata_display	2022-03-03 15:46:19 -08:00
Brady Wetherington	92434fa943	Revert "Revert "refactor and clean up attribute-changing logic for assets"" This reverts commit `bdc737ce0c`.	2022-03-03 15:45:54 -08:00
Brady Wetherington	0164354463	Fix for the weird error that blew up the demo when my PR got merged	2022-03-02 15:15:16 -08:00
snipe	bdc737ce0c	Revert "refactor and clean up attribute-changing logic for assets" This reverts commit `290baf1c8d`. Signed-off-by: snipe <snipe@snipe.net>	2022-03-02 14:45:14 -08:00
snipe	733b3a7550	Merge pull request #10682 from uberbrady/fix_bad_metadata_display Fixed weird JSON-handling on log_meta updates	2022-03-02 14:36:38 -08:00
snipe	3339a691e1	Merge pull request #10721 from snipe/features/adds_users_consumables_endpoint Added consumables endpoint to user API	2022-03-02 14:33:45 -08:00
Ivan Nieto Vivanco	0df9dd8320	Delete a function that is not longer used	2022-03-01 18:59:50 -06:00
snipe	2eef43e8bf	Applies develop fix to master for location drop downs	2022-03-01 12:43:35 -08:00
Andrew Roth	2e60420aeb	Fix for location and model drop down with granular permissions.	2022-02-28 17:38:38 -05:00
Godfrey M	533670f3f1	faulty method for converting asset acceptance to pdf	2022-02-24 14:50:16 -08:00
Ivan Nieto Vivanco	64fa7e23fc	Separate notes on assets and asset models	2022-02-24 16:05:03 -06:00
Ivan Nieto Vivanco	577dc6b02c	Separate notes on assets and asset models	2022-02-24 15:50:59 -06:00
snipe	2906a89442	Make the 429 error less stupid Signed-off-by: snipe <snipe@snipe.net>	2022-02-24 13:10:34 -08:00
snipe	50f55b4308	Fixes broken API throttling Signed-off-by: snipe <snipe@snipe.net>	2022-02-24 13:10:10 -08:00
snipe	a8028e7dd0	Merge pull request #10727 from uberbrady/master Fix for negative CORS/SAML interaction	2022-02-23 11:17:17 -08:00
Brady Wetherington	15abc84ab0	Migrate to Fruitcake/laravel-cors which has path-exclusion built-in	2022-02-23 11:06:19 -08:00
snipe	42fcd29200	Fixed #10436 on master, applies #10449 Signed-off-by: snipe <snipe@snipe.net>	2022-02-22 21:06:54 -08:00
snipe	dc2e6c2b06	Adds consumables endpoint to user API Signed-off-by: snipe <snipe@snipe.net>	2022-02-22 20:44:34 -08:00
Brady Wetherington	294606fb0b	Move new CORS library to global middleware, the only place it works	2022-02-22 19:07:23 -08:00
Brady Wetherington	64f83f9a5f	Move HandleCors middleware to be universal	2022-02-22 17:43:40 -08:00
snipe	0a4a548f9c	Added use statement Signed-off-by: snipe <snipe@snipe.net>	2022-02-22 10:46:02 -08:00
snipe	dd5f812d88	Merge remote-tracking branch 'origin/master' into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/FixDoubleEscape.php # app/Console/Commands/LdapSync.php # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/CompaniesController.php # app/Http/Controllers/Api/DepartmentsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/ManufacturersController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Auth/LoginController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Models/Loggable.php # app/Providers/AuthServiceProvider.php # config/version.php # database/migrations/2014_11_04_231416_update_group_field_for_reporting.php # database/migrations/2015_11_08_222305_add_ldap_fields_to_settings.php # package-lock.json # package.json # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/assets/js/components/forms/asset-models/fieldset-default-values.vue # resources/views/hardware/view.blade.php	2022-02-20 13:29:12 -08:00
Ivan Nieto Vivanco	23a6907975	Some minor stylistic changes	2022-02-17 18:05:06 -06:00
Ivan Nieto Vivanco	5b2a5ff124	Put the 'remember_token' column as null in the users table	2022-02-17 18:03:00 -06:00
Ivan Nieto Vivanco	548b172744	Logout every connected user	2022-02-17 18:00:24 -06:00
Ivan Nieto Vivanco	263893b3c6	Search logged in user that made the restore, if they doesn't exist in the restored system, add it again	2022-02-17 17:42:06 -06:00
Ivan Nieto Vivanco	811ca51c4f	Wipe database before restoration	2022-02-17 16:59:44 -06:00
snipe	d1b45a83b8	Blergh, one more linebreak Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:51:06 -08:00
snipe	01a8701a8c	Removed extra linebreaks Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:50:38 -08:00
snipe	67fe53e32a	Removed debugging, added comments Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:50:07 -08:00
snipe	7f6b8cc43d	Removed carbon, since we went with PHP's datetime instead Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:48:12 -08:00
snipe	5fe999eb02	Shored up the date math, updated the explanation Signed-off-by: snipe <snipe@snipe.net>	2022-02-17 14:34:33 -08:00
snipe	ea429d650e	Initial audit date fix Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 20:19:38 -08:00
snipe	824eedf7c2	Added UI elements for is_unique Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:47:48 -08:00
snipe	a4a0aa5124	Removed debugging line Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:47:22 -08:00
snipe	6a91d4d19e	Check for uniqueness constraint Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:46:22 -08:00
snipe	ea8f9a6dd9	Make is_unique fillable Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 13:45:44 -08:00
snipe	b78f32e876	Merge pull request #10655 from inietov/fixes/trying_to_get_property_checkin_email_of_non-object_develop Fixes ErrorException: Trying to get property 'checkin_email' of non-object for develop[sc-17568]	2022-02-16 11:19:14 -07:00
snipe	592f66bd0c	Merge pull request #10670 from Godmartinz/gh10639/linear-depreciation-calculation Fixed #10639 - incorrect linear depreciation calculation	2022-02-16 11:18:27 -07:00
snipe	4f89dfee49	Merge pull request #10679 from snipe/fixes/timing_attack_mitigation_for_forgot_password Added usleep random to forgotten password method to mitigate timing attacks	2022-02-16 11:17:00 -07:00
snipe	017534bc07	Added deleted_at to license transformer Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 09:33:28 -08:00
snipe	5540069cce	Be more specific with deleted license point Require this value to be "true" speciically to get the deleted list Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 09:14:04 -08:00
snipe	1ad56760ce	Adds delete endpoint for licenses Signed-off-by: snipe <snipe@snipe.net>	2022-02-16 09:08:50 -08:00
Brady Wetherington	290baf1c8d	refactor and clean up attribute-changing logic for assets	2022-02-15 18:29:45 -08:00
snipe	f878e0ad66	Fixes 2FA cookie -> user issue Signed-off-by: snipe <snipe@snipe.net>	2022-02-15 18:29:23 -08:00
snipe	178e440951	Added usleep :( Signed-off-by: snipe <snipe@snipe.net>	2022-02-15 18:09:58 -08:00
snipe	cab4fa1687	Fixes some conceptual gates Signed-off-by: snipe <snipe@snipe.net>	2022-02-14 15:42:23 -08:00
snipe	4804e5b3ab	Added Asset edit/delete gates to maintenances Signed-off-by: snipe <snipe@snipe.net>	2022-02-14 15:34:06 -08:00
Godfrey M	7b9a2ae909	added rounding	2022-02-14 09:34:42 -08:00
Godfrey M	6e204a20ca	fixed current value formula	2022-02-14 09:28:35 -08:00
Godfrey M	e6e68934f7	adds a months depreciated variable	2022-02-14 09:13:14 -08:00
Godfrey M	cdc402fa04	WIP formula for linear Depreciation has been corrected. still one variable left to fix.	2022-02-14 09:01:42 -08:00
snipe	1c0a96b0ce	Added gate to supplier Signed-off-by: snipe <snipe@snipe.net>	2022-02-13 11:58:12 -07:00
snipe	d77a47765e	Adds gate to supplier Signed-off-by: snipe <snipe@snipe.net>	2022-02-13 11:53:45 -07:00
Dampfklon	0d49fc3a2e	remove unused route, controller functions and view	2022-02-13 12:10:19 +01:00
snipe	d6b8222371	Refactor to combine permissions Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 12:48:30 -08:00
snipe	2c5abaaea4	Fixed copypasta Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 12:32:09 -08:00
snipe	c1a0653847	Restrict to update or create gate methods for select lists Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 12:31:11 -08:00
snipe	9226c8292d	Fixed typos in comments Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 12:02:14 -08:00
snipe	5fafa81dc1	Forgot components Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 11:57:29 -08:00
snipe	b30d1dce89	Removed selectlist Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 11:55:24 -08:00
snipe	2dad27eed6	Added additional gate for selectlists Signed-off-by: snipe <snipe@snipe.net>	2022-02-11 11:46:14 -08:00
snipe	f5ffda8053	Ahem. Signed-off-by: snipe <snipe@snipe.net>	2022-02-10 22:43:51 -08:00
snipe	ed931ef0cd	Merge pull request #10654 from inietov/fixes/trying_to_get_property_checkin_email_of_non-object Fixes ErrorException: Trying to get property 'checkin_email' of non-object [sc-17568]	2022-02-10 12:23:50 -08: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
Ivan Nieto Vivanco	bf4ee18123	Validates if model and model->category exist before return the checkin_email property	2022-02-10 11:58:55 -06:00
snipe	70af10ae6c	Merge pull request #10640 from JonathonReinhart/10552-add-checkin-api-date Fix #10552: Add checkin_at parameter to /hardware/:id/checkin API	2022-02-10 09:54:20 -08:00
snipe	b9a8d45c07	Better messaging Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 16:30:42 -08:00
snipe	7794c2f44b	Check that the fieldset exists before trying to detach it from the fieldset Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 16:16:16 -08:00
snipe	eedc14401a	Switch to searching on semicolon instead of & Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 15:55:22 -08:00
snipe	4e14d70427	Added jobtitle to unescaper Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 15:50:44 -08:00
snipe	2a71690aaf	Added license_name to unescaper Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 15:17:57 -08:00
snipe	e4da00ca82	Catch potential validation errors on unescape tool Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 15:09:49 -08:00
snipe	4fd14e5859	Added slightly more output because wtf? Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 15:05:28 -08:00
snipe	441f1fbb64	Remove html_entities_decode restriction Signed-off-by: snipe <snipe@snipe.net>	2022-02-09 14:56:36 -08:00
snipe	d06e3dd892	Merge branch 'master' of https://github.com/snipe/snipe-it	2022-02-09 14:40:33 -08:00
snipe	6b25b53462	Merge pull request #10628 from inietov/fixes/default_values_dont_allow_checkbox_radio Fixes #10299 Default Values do not allow Checkbox/Radio Buttons	2022-02-09 14:39:46 -08:00
Ivan Nieto Vivanco	6d79c9f3e2	Save the default values for custom fields with same format than Assets do for actual values	2022-02-09 13:41:33 -06:00
Ivan Nieto Vivanco	a36957dd77	Finish the implementation of custom fields default values for checkboxes	2022-02-09 13:12:42 -06:00
Ivan Nieto Vivanco	2f3499e4b9	Show checkboxes a little less assy, actually save the data checked by them	2022-02-09 10:49:10 -06:00
Jonathon Reinhart	3536d08477	Add checkin_at parameter to /hardware/:id/checkin API Fixes #10552	2022-02-08 20:23:09 -05:00
Brady Wetherington	c300e7c7f6	Remove extraneous backslash	2022-02-08 12:23:15 -08:00
Brady Wetherington	fb890fbc30	Properly alert when invalid JSON is submitted to something that wants JSON	2022-02-08 12:22:59 -08:00
Brady Wetherington	9a66f6a254	Remove extraneous backslash	2022-02-08 12:09:40 -08:00
Brady Wetherington	5e94726ec1	Properly alert when invalid JSON is submitted to something that wants JSON	2022-02-08 12:05:05 -08:00
Ivan Nieto Vivanco	413e44be2f	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:58:23 -06:00
Ivan Nieto Vivanco	d71aa859fc	Add custom date to checkin actionlogs and show it in the history of the asset tab	2022-02-08 11:43:24 -06:00
Jonathon Reinhart	cd963179fd	Fix /hardware/{id}/checkin API response on error Fixes #10629	2022-02-08 01:08:42 -05:00
snipe	474f24e40e	Merge branch 'master' of https://github.com/snipe/snipe-it	2022-02-07 18:27:59 -08:00
snipe	b3a0f86431	Temp fix for weird JSON format in history Signed-off-by: snipe <snipe@snipe.net>	2022-02-07 18:27:55 -08:00
Brady Wetherington	a15c0adc79	Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs	2022-02-07 11:33:38 -08:00
Brady Wetherington	f1d4087317	Fix "secure hostnames" feature for subdirectory-based Snipe-IT installs	2022-02-07 11:26:54 -08:00
Brady Wetherington	36ae6f9430	Yanked debugging code, tightened up comments.	2022-02-03 19:41:16 -08:00
Brady Wetherington	1945b97b72	Just trying to really tighten up on the LDAP Active Flag and how we parse it.	2022-02-03 19:04:56 -08:00
Brady Wetherington	392e61688d	Rework the LDAP sync command to better handle the active flag	2022-02-03 15:01:45 -08:00
snipe	ac5c6123bc	Fixes #10563 - LDAP active flag - hopefully? Signed-off-by: snipe <snipe@snipe.net>	2022-02-02 18:07:34 -08:00
Ivan Nieto Vivanco	eac8e0bdba	Add a casting to a truthy/falsy that needs to be integer	2022-02-02 13:54:57 -06:00
snipe	ce154a2382	Merge pull request #10455 from adagioajanes/features/quickscan_checkin Added #10454: Quick Scan Checkin	2022-02-01 20:19:45 -08:00
snipe	06a5ea1530	Fixed duplicate use statement Signed-off-by: snipe <snipe@snipe.net>	2022-02-01 18:57:45 -08: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
snipe	669826f6b2	Merge pull request #10574 from uberbrady/fix_force_root_url_v6 Add some guardrails around very-badly formatted APP_URL settings	2022-02-01 16:14:48 -08:00
snipe	8083ba8dca	Merge pull request #10590 from inietov/fixes/bulkedit_does_not_show_in_history_develop Fixes Bulk edit doesn't show in Asset's history nor Activity report for develop [sc-16550]	2022-02-01 16:14:25 -08:00
Ivan Nieto Vivanco	3ef775533a	Adds actionlog for bulk edits	2022-02-01 12:10:46 -06:00
Ivan Nieto Vivanco	2fec40d7df	Adds actionlog for bulk edits	2022-02-01 00:00:12 -06:00
Brady Wetherington	72e9360228	Merge remote-tracking branch 'upstream/develop' into develop	2022-01-31 10:13:30 -08:00
snipe	aa3aa78204	Adds Lookup Asset by Custom Field via API [sc-18632] Signed-off-by: snipe <snipe@snipe.net>	2022-01-28 09:08:48 -08:00
snipe	db0a078c0b	Merge pull request #10573 from uberbrady/fix_force_root_url Add some guardrails around very-badly formatted APP_URL settings	2022-01-27 11:29:29 -08:00
Brady Wetherington	44719e3dcc	Fix whitespace issues	2022-01-27 11:29:20 -08:00
Brady Wetherington	1cf1278b3b	Fix whitespace issues	2022-01-27 11:28:51 -08:00
Brady Wetherington	476075235a	Add some guardrails around very-badly formatted APP_URL settings	2022-01-27 11:24:21 -08:00
Brady Wetherington	70648dedd3	Add some guardrails around very-badly formatted APP_URL settings	2022-01-27 11:21:46 -08:00
snipe	a65fb63b6b	Merge pull request #10511 from inietov/features/audit_date_in_importer Adds audit dates in the asset importer	2022-01-27 10:58:53 -08:00
snipe	9634dde0dd	Merge pull request #10567 from inietov/fixes/importing_and_checking_out_licenses_master Fixes Importing licenses without product key duplicates the license	2022-01-27 10:58:06 -08:00
snipe	c70ae19c28	Merge pull request #10529 from uberbrady/fix_insecure_host_headers Force UrlGenerator's Root URL to be the base of APP_URL unless overriden (v5)	2022-01-26 16:59:55 -08:00
snipe	b153138d1e	Merge pull request #10534 from inietov/feature/add_remaining_address_field_to_user_import_develop Add Zip field in the User Importer for develop [sc-18556]	2022-01-26 16:58:37 -08:00
Ivan Nieto Vivanco	55fdc86e02	Tweak query in the License Importer to not require a Product Key	2022-01-26 17:51:04 -06:00
Ivan Nieto Vivanco	450cb8f92f	Tweak query in the License Importer to not require a Product Key	2022-01-26 17:49:34 -06:00
Brady Wetherington	48f1380f6e	Merge pull request #10528 from uberbrady/fix_insecure_host_headers_v6 Force UrlGenerator's Root URL to be the base of APP_URL unless overriden	2022-01-24 18:26:30 -08:00
Ivan Nieto Vivanco	7383ec7f1e	Add an early return if the model id is not set (for new Asset Models)	2022-01-21 11:45:45 -06:00
Ivan Nieto Vivanco	c86ed892ab	Add Zip field in the User Importer	2022-01-19 13:52:15 -06:00
Ivan Nieto Vivanco	1fc71a4111	Add Zip field in the User Importer	2022-01-19 13:35:54 -06:00
Brady Wetherington	0c4768fd2a	Force UrlGenerator's Root URL to be the base of APP_URL unless overriden (For v5)	2022-01-18 15:52:59 -08:00
Brady Wetherington	455bc736be	Force UrlGenerator's Root URL to be the base of APP_URL unless overriden	2022-01-18 15:31:30 -08:00
Ivan Nieto Vivanco	a05795420a	Respect the default value of 60 days in expiring licenses	2022-01-18 14:34:14 -06:00
Ivan Nieto Vivanco	42d86bf57b	Adds default values if the expiring alerts threshold is null	2022-01-18 14:21:49 -06:00
Ivan Nieto Vivanco	f510b9c2a9	Add query to filter non-deprecable assets when the Depreciation Report is called	2022-01-15 14:21:31 -06:00
Ivan Nieto Vivanco	8334ed6f7e	Add query to filter non-deprecable assets when the Depreciation Report is called	2022-01-15 14:01:19 -06:00
Ivan Nieto Vivanco	153c30eda8	Add to Importer the capacity to search Models only with Model Name since Model Number is not required	2022-01-15 04:32:47 -06:00
Ivan Nieto Vivanco	58b1db29e2	Adds condition to only update the Asset's Model Number if is provided by import file	2022-01-15 04:15:38 -06:00
Ivan Nieto Vivanco	8bd280b416	Add to Importer the capacity to search Models only with Model Name since Model Number is not required	2022-01-15 04:12:30 -06:00
Brady Wetherington	ef463a37d8	Make 'pending' assets properly requestable; use requestable scope	2022-01-14 12:48:33 -08:00
snipe	207ff014b1	Merge pull request #10514 from uberbrady/fix_double_wildcard_query_requestable Fixed extraneous wildcard query in requestable asset search	2022-01-13 19:39:08 -08:00
Brady Wetherington	65e584c2bd	Revert the unnecessary optimization for asset->count()	2022-01-13 19:37:08 -08:00
snipe	24a234ede3	Merge pull request #10503 from uberbrady/develop_fix_dont_req_preauth_uac Permit DONT_REQ_PREAUTH AD users to log in	2022-01-13 17:01:59 -08:00
snipe	be7e6ed847	Merge pull request #10502 from uberbrady/ldap_useraccountcontrol_dont_req_preauth Add new UserAccountControl to permitted UAC's for AD.	2022-01-13 17:01:47 -08:00
Brady Wetherington	4e8ae8a162	Fix extraneous wildcard query in requestable asset search	2022-01-13 16:32:40 -08:00
Ivan Nieto Vivanco	949fe2a14a	Adds last_audit_date and next_audit_date in the asset importer	2022-01-13 15:14:20 -06:00
snipe	984db1ef44	Apply personal API token fix to master Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:39:56 -08:00
snipe	512dbfee7a	Added gate to check that the user is allowed to view API keys Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:33:27 -08:00
snipe	eb8f23a888	Removed commented code Signed-off-by: snipe <snipe@snipe.net>	2022-01-13 01:32:28 -08:00
snipe	8f4ec95fbb	Remove assets query, since we handle that via API call now and just need the count() Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 23:23:00 -08:00
snipe	224d0b2fd2	Small language file additions Signed-off-by: snipe <snipe@snipe.net>	2022-01-12 22:21:00 -08:00
snipe	43c57c8461	Merge master into develop Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Http/Controllers/BulkAssetModelsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/ModalController.php # app/Http/Transformers/GroupsTransformer.php # config/version.php # package-lock.json # 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/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/less/overrides.less # resources/lang/en/admin/hardware/message.php # resources/lang/en/admin/settings/general.php # resources/views/partials/bootstrap-table.blade.php # routes/web.php	2022-01-12 20:51:33 -08:00
Brady Wetherington	a063806bcc	Permit DONT_REQ_PREAUTH AD users to log in	2022-01-12 12:50:39 -08:00
Brady Wetherington	c8fe929e09	Add new UserAccountControl to permitted UAC's for AD.	2022-01-12 12:07:51 -08:00
Alex Janes	d2bb3e6377	Merge branch 'develop' into features/quickscan_checkin	2022-01-11 16:40:20 -05:00
Alex Janes	edef640d35	Merge branch 'develop' into features/lock_logins_to_saml	2022-01-11 09:05:14 -05:00
snipe	ea83567e7d	Merge pull request #10494 from exula/fix/increase_max_licenses Fixed #7824	2022-01-10 15:04:47 -08:00
snipe	d9624b59b4	Merge pull request #10264 from nuraeil/added-localized-strings Added #10242: Improved localized strings	2022-01-10 14:48:52 -08:00
Brad	6b6a83a525	Removing something stupid PHPStorm put in the use area	2022-01-10 14:21:19 -05:00
Brad	81084fa717	Fixed #7824 Previously there was a 999 max seats on Licenses as anything above that seemed to cause slowdowns and failure. This commit allievates those pain points - removed freeSeats as a hydrated Eloquent model on JSON requests for the licenses index - removed 'licenseSeats.user', 'licenseSeats.asset' from the 'with' clause as it's not needed in the view (Datatabales takes care of that) - removed the 999 max seats limit from the License Model, - reworked how new license seats are created when increasing seats or creating licenses - Added an index the license_seats table to help speed up lookups	2022-01-10 14:03:28 -05:00
Wächtler, Yannick	04d649122b	Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO	2022-01-06 12:35:37 +01:00
Haxatron	bb095641c2	Update BulkAssetModelsController.php https://huntr.dev/bounties/efdf2ead-f9d1-4767-9f02-d11f762d15e7	2022-01-06 09:50:11 +08:00
snipe	884b6b0270	Fixes format property on invalid custom field object Signed-off-by: snipe <snipe@snipe.net>	2022-01-03 19:14:50 -08:00
Brady Wetherington	95c30cae8d	Some duplicate imports at the top of the Settings file	2022-01-03 13:53:53 -08:00
Brady Wetherington	3c7f2e89ec	Merge branch 'develop' into remove_old_ldap Had to re-do the composer install because the conflicts were too complicated.	2022-01-03 12:56:58 -08:00
snipe	2ee84c2675	Added a few more comments Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 18:33:28 -08:00
snipe	c6ce928567	Added allow list to modal view options Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 18:16:49 -08:00
snipe	b4fac3e4ae	Fixed missing index for fieldsets Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 13:16:44 -08:00
snipe	bad6b862ca	assets_count doesnt exist as a column Signed-off-by: snipe <snipe@snipe.net>	2021-12-30 12:59:16 -08:00
snipe	359b22e17a	Applies #10470 to develop Signed-off-by: snipe <snipe@snipe.net>	2021-12-27 13:22:47 -08:00
snipe	8588e9ebf1	Fixed #10469 - increased size of supplier address field Signed-off-by: snipe <snipe@snipe.net>	2021-12-27 12:28:02 -08:00
Alex Janes	d0bfd8dfd2	Fixed the collection of the groups total to GroupsTransformer.php. Groups page should now paginate correctly.	2021-12-23 20:54:34 -05:00
Alex Janes	7acb559069	corrected issue with asset not found errors	2021-12-20 19:55:00 -05:00
Alex Janes	2b5aca183c	removed unnecessary additional data call from api method	2021-12-19 19:21:58 -05:00
Alex Janes	14b21a6e95	removed some whitespace	2021-12-19 19:17:32 -05:00
Alex Janes	08cb8c354b	more cleanup to fit formatting convention	2021-12-19 19:11:24 -05:00
Alex Janes	29da4f4325	Removed a bunch of redundant code I created from the API	2021-12-19 18:39:57 -05:00

... 15 16 17 18 19 ...

4626 commits