1314 commits

Author	SHA1	Message	Date
spencerrlongg	4d67c72eea	scope and switch case in api	2023-09-28 12:26:23 -05:00
spencerrlongg	c48a47936c	add validation back in	2023-09-20 14:00:59 -05:00
spencerrlongg	6b4f8f1813	rm duplicate fillable	2023-09-19 18:07:15 -05:00
spencerrlongg	929e107a20	rm byod from casts	2023-09-19 18:04:16 -05:00
snipe	2166d6649d	Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled ... Fixed #13336 - Save unhashed password if no password provided	2023-09-14 14:15:53 +01:00
snipe	dcae5503c8	Use $attributes array ... Signed-off-by: snipe <snipe@snipe.net>	2023-09-14 13:52:57 +01:00
snipe	d916e20c10	Merge pull request #13415 from marcusmoore/feature/department-scoping ... Added `CompanyableTrait` to `Department` model	2023-09-14 12:52:53 +01:00
spencerrlongg	7047869367	cleanup	2023-09-12 18:03:13 -05:00
spencerrlongg	fb001caee4	fix conflicts	2023-09-11 17:33:31 -05:00
slong753	75d7e3e1a0	fix conflicts	2023-09-11 17:20:21 -05:00
slong753	774f21bb7f	some more cleanup	2023-09-11 17:17:59 -05:00
slong753	20367eecc9	fix conflicts	2023-09-11 17:17:59 -05:00
slong753	c1daabef08	progress	2023-09-11 17:10:41 -05:00
Godfrey Martinez	a26b96185b	Merge branch 'develop' into asset-model-notifs	2023-09-11 09:37:22 -07:00
Ivan Nieto Vivanco	1509c512a5	Add guard clauses around some License and LicenseSeat models functions	2023-09-06 11:54:11 -06:00
johnson-yi	5897f4d6d9	Add rtd_location_id to tracked changes on checkin actionlog	2023-09-06 00:36:48 +00:00
snipe	d6dd332b09	Merge pull request #13557 from johnson-yi/fixes/add_changes_to_checkinout_actionlog ... Added/Fixed: track changes on asset checkin/out	2023-09-05 19:08:49 +01:00
snipe	b17af38d8e	Merge pull request #12901 from Godmartinz/user_total_cost ... Added users total cost of assets to user profile	2023-09-05 13:52:34 +01:00
snipe	a62e2f092b	Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report ... Added last check in column and filter to custom asset report	2023-09-05 13:22:15 +01:00
Johnson Yi	09f7b3debe	Track changes on asset checkin/out	2023-09-01 13:12:07 +10:00
snipe	663faffcc1	Un-cast byod, validate as boolean ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-30 19:13:55 +01:00
snipe	2a93c38830	Don’t cast as boolean, validate as boolean ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-30 16:40:28 +01:00
snipe	18ff810d7e	Reverse orderof parent ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-28 20:51:52 +01:00
snipe	baffcbad71	Set password property properly ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-28 20:47:56 +01:00
Godfrey M	8ebb9afedd	adds min_amt to asset model edit, index, and table	2023-08-24 10:30:07 -07:00
snipe	a48762c64d	Merge pull request #13496 from snipe/features/setting_for_name_order ... Fixed #13495 added setting for name order	2023-08-22 12:50:58 +01:00
snipe	aafb7668f5	Merge pull request #13453 from inietov/fixes/accessories_declined_issue ... Fixed #13317 Accessories declined by user remain assigned	2023-08-22 12:42:55 +01:00
snipe	fea11ec7f1	Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields ... Bulk Editing Custom Fields	2023-08-22 12:40:18 +01:00
snipe	354550b52e	Removed getCompleteNameAttribute(), modified getFullNameAttribute() ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-21 20:11:17 +01:00
Marcus Moore	489d30c685	Set last_checkin in ui and api controllers	2023-08-21 11:57:33 -07:00
snipe	45898deb1a	Don’t 500 if the 1D barcode doesn’t match the format requested - log an error instead ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-18 22:18:38 +01:00
snipe	d12f4564e1	Added Dymo Labelwriter template ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-18 21:44:12 +01:00
snipe	d56c671410	Removed the black label from around the default labels ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-18 18:39:00 +01:00
snipe	0cb76a049a	Make sure the columns and rows can never be 0 ... Signed-off-by: snipe <snipe@snipe.net>	2023-08-18 18:13:16 +01:00
Ivan Nieto Vivanco	b607a59875	Add query to search default locations in advanced search	2023-08-16 15:04:17 -06:00
snipe	e41368daac	Merge pull request #12050 from cram42/develop ... New Label Engine	2023-08-15 17:58:57 +01:00
Ivan Nieto Vivanco	96440834bd	Move the declinedCheckout function so it don/'t separate the class properties	2023-08-14 16:16:28 -06:00
Ivan Nieto Vivanco	4796598bb6	Add declinedCheckout method to Accessory model	2023-08-14 14:35:31 -06:00
Robert-Azelis	bbb8ecfee4	Update Company.php	2023-08-13 17:21:55 +02:00
Marcus Moore	f7b2075e9e	Add CompanyableTrait to Department	2023-08-07 16:54:02 -07:00
Grant Le Roux	b1464e028c	Merge branch 'develop' into develop	2023-07-31 07:57:29 +08:00
snipe	540b09c506	Possible alternative to fixing #13296 - custom report failing when the model is busted ... Related: https://github.com/snipe/snipe-it/pull/13297 Signed-off-by: snipe <snipe@snipe.net>	2023-07-20 17:45:45 +01:00
snipe	1e09320ebe	Check that $this->get_depreciation() returns ... Signed-off-by: snipe <snipe@snipe.net>	2023-07-20 16:30:07 +01:00
snipe	b54e7dc3ee	Fixed #13336 - Save unhashed password if no password provided ... Signed-off-by: snipe <snipe@snipe.net>	2023-07-19 17:44:40 +01:00
snipe	3078cab7ee	Added ability to show/hide custom fields in list views by default ... Signed-off-by: snipe <snipe@snipe.net>	2023-07-14 09:09:43 +01:00
snipe	981c3a430d	Merge pull request #13301 from uberbrady/better_auto_increment_tags ... Better auto increment asset-tags [FD-32892]	2023-07-13 09:49:44 +01:00
Brady Wetherington	76191a09ed	Improvements to asset_tag auto-incrementing, with auto-fixups for gaps	2023-07-12 16:39:45 +01:00
snipe	ba37a9db8c	Merge pull request #13277 from snipe/features/added_phone_fax_to_locations ... Added phone, fax to departments, locations, companies	2023-07-11 11:15:13 +01:00
Ivan Nieto Vivanco	ec8cb1b09e	Add the withTrashed() method to requestingUser() method in CheckoutRequest model, so the view of requestable assets doesn't crash	2023-07-10 16:34:00 -06:00
snipe	14c61e4c17	Added phone, fax to departments, locations, companies ... Signed-off-by: snipe <snipe@snipe.net>	2023-07-10 19:44:21 +01:00
snipe	bcefe73c9c	Use proper alias for table scope ... Signed-off-by: snipe <snipe@snipe.net>	2023-06-29 16:52:09 +01:00
snipe	a3096e1b47	Merge pull request #13219 from inietov/features/cancel_request_asset ... Cancel requested assets without checkin/out [ch-17606]	2023-06-29 16:18:13 +01:00
Ivan Nieto Vivanco	eb4d764601	Refactor Requestable@cancelRequest() firm to admit a user_id so we can cancel a request of whatever user we want	2023-06-27 17:13:11 -06:00
slong753	2a352619f7	clean up	2023-06-26 16:25:48 -05:00
Godfrey M	114d946437	adds half_year fix from jdickerson71388	2023-06-26 11:26:46 -07:00
snipe	4f7b2836b5	Set table alias for model number sort scope ... Signed-off-by: snipe <snipe@snipe.net>	2023-06-26 08:27:17 +01:00
Spencer Long	f646623a5e	Merge branch 'develop' into bulk_edit_custom_fields	2023-06-22 18:00:31 -05:00
Ivan Nieto Vivanco	f9a20bc917	Replace join with left join in pertinent eloquent query	2023-06-01 12:08:51 -06:00
snipe	e431cd5146	Merge pull request #13085 from inietov/fixes/checkboxes_not_holding_value ... Fixed #12978 Custom Field Checkboxes not holding assigned values	2023-05-31 10:55:37 -04:00
ak-piracha	1cdf089306	Fixes: issue #13073: deleted component addearing in asset component tab fixed	2023-05-31 00:11:11 +09:30
Ivan Nieto Vivanco	f4947bfa93	Use trim() function when format the custom field values as array	2023-05-24 04:06:31 -06:00
Marcus Moore	0a3d46824e	Automatically add table prefixes when building multi-column search string	2023-05-23 15:58:58 -07:00
Marcus Moore	b2b6f0cf96	Use new dynamic scope where possible	2023-05-23 13:38:50 -07:00
Marcus Moore	054d71aedc	Add docblock	2023-05-23 13:37:04 -07:00
Marcus Moore	9078d4c71c	Add dynamic scope for prettier multiple column search	2023-05-23 13:35:19 -07:00
Marcus Moore	05a2e568d7	Add comment	2023-05-23 11:37:09 -07:00
Marcus Moore	f40e722397	Add docblock	2023-05-22 17:44:17 -07:00
Marcus Moore	9b512648a3	Update searchRelations in Searchable trait	2023-05-22 17:33:19 -07:00
Marcus Moore	64e83ed9f5	Update scopeAssignedSearch in Asset	2023-05-22 16:54:54 -07:00
Marcus Moore	2d86c8f030	Update advancedTextSearch methods in Asset and User models	2023-05-18 17:06:41 -07:00
Marcus Moore	85974c7f65	Apply formatting	2023-05-18 13:16:52 -07:00
Marcus Moore	ffbde46180	Simplify sqlite query	2023-05-18 13:06:50 -07:00
Marcus Moore	d8d672c4c1	Move multiple column search function to Searchable trait	2023-05-18 13:05:40 -07:00
Marcus Moore	9cb0decf35	Adapt multiple column search based on database driver	2023-05-18 12:54:00 -07:00
snipe	8bad72a80f	Added validation on google client ID ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 02:40:45 -07:00
snipe	63bf93b786	Pulled redirect from settings ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 00:56:04 -07:00
snipe	3fb5188037	Removed redirect option ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 00:54:46 -07:00
snipe	054a2ab9d4	Add validation and fillable fields ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-10 00:34:31 -07:00
snipe	f1d85c67f1	Make validation match database fields ... Signed-off-by: snipe <snipe@snipe.net>	2023-05-08 14:12:54 -07:00
snipe	6486ea4fb7	Merge pull request #12976 from inietov/fixes/validate_soft-deleted_models_in_asset_model ... Refactor of #12955	2023-05-08 13:14:02 -07:00
snipe	d70e14de61	Merge pull request #12972 from marcusmoore/bug/sc-23177 ... Fixes user name missing in accessory acceptance notifications	2023-05-08 13:04:37 -07:00
Ivan Nieto Vivanco	fbb7c55450	Tweak 'exist' rule in Asset->model_id field so it ignores soft-deleted models	2023-05-04 03:12:36 -06:00
Marcus Moore	f96d8fe674	Add CheckoutAcceptance factory	2023-05-03 14:21:13 -07:00
snipe	b716f9f55e	Merge pull request #12916 from snipe/features/auto_add_to_fieldset ... Added ability to auto-add fields to new fieldsets	2023-05-03 11:04:33 -07:00
snipe	ea17fdeba5	Merge pull request #12846 from snipe/features/livewire_location_import ... Location importer via Livewire Importer	2023-05-03 11:02:06 -07:00
snipe	4a643c1252	Merge pull request #12880 from Godmartinz/asset_total_cost ... Added component costs to asset view	2023-05-03 10:49:03 -07:00
snipe	aa814cf761	Fixed #12946 - warranty lookup url was not nullable ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-29 13:47:52 -07:00
snipe	7974c172fd	Switch back to “normal” url for support ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-26 16:48:38 -07:00
snipe	54a766c4f9	Added dynamic warranty URL to manufacturers ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-26 16:39:15 -07:00
snipe	5eac314f4d	Merge pull request #12906 from akemidx/feature/sc-20622 ... Dynamic warranty link for manufacturers' support urls	2023-04-26 14:49:22 -07:00
akemidx	497d17835f	requested edits	2023-04-26 17:06:08 -04:00
akemidx	aab53cf683	remove regex, add in starts_with	2023-04-26 15:18:13 -04:00
snipe	22d73f503a	Merge pull request #12756 from dboth/develop ... Fixed #8208, #8896, #8985 and #9789: Currency issues when using non-english locales (resubmission)	2023-04-25 22:32:13 -07:00
snipe	970b5e556c	Merge pull request #12903 from marcusmoore/bug/sc-15034 ... Fixes sending webhook notifications for checkout and checkin	2023-04-25 22:22:58 -07:00
snipe	d6ea5de5b8	Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset	2023-04-25 22:20:50 -07:00
snipe	c8c6f879d4	Merge pull request #12912 from Godmartinz/ldap_location_sync ... added ldap_location to settings	2023-04-25 21:54:28 -07:00
snipe	27477085fe	Merge branch 'develop' into features/auto_add_to_fieldset	2023-04-25 21:31:50 -07:00
snipe	07336bbc6a	Added auto_add_to_fieldsets field ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-25 15:51:36 -07:00
Brady Wetherington	3da5df0127	Change from a standard Eloquent mapping for ID to a custom setRead	2023-04-25 11:50:55 -07:00
Godfrey M	20d8ff2a4f	removed a typo	2023-04-25 11:49:33 -07:00
Godfrey M	cb68f41d9c	added ldap_location to settings	2023-04-25 11:44:04 -07:00
akemidx	9cd2783185	Regex added for link instead	2023-04-24 20:07:21 -04:00
Godfrey M	97df39001d	adds optional breakdowns for total cost	2023-04-19 17:51:37 -07:00
Godfrey M	6872f8da7b	adding total cost to user view	2023-04-19 17:31:09 -07:00
Godfrey M	bd212b3108	adds component costs to asset view	2023-04-19 16:35:06 -07:00
Marcus Moore	15280c435e	Merge branch 'develop' into bug/sc-15034	2023-04-19 11:45:16 -07:00
snipe	9da36833be	Removed unused method ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-18 02:43:44 -07:00
snipe	e84ba0c7a0	Revert back to old method name ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-18 02:06:32 -07:00
snipe	de78f8d41f	Renamed/refactorered licenses method ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-18 01:01:44 -07:00
snipe	6ab4314221	Removed unused method ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-18 01:01:13 -07:00
Marcus Moore	2d56675ade	Merge branch 'develop' into bug/sc-15034 ... # Conflicts: # database/factories/SettingFactory.php	2023-04-17 17:22:55 -07:00
snipe	99cecee4b5	Merge branch 'develop' into features/adds_license_checkin_checkout_to_all_in_gui	2023-04-17 14:54:30 -07:00
slong753	52dc99588e	pushing for now, needs validation work	2023-04-17 13:57:48 -05:00
snipe	e0c53d8d09	Remove start/end dates form casts array ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-17 09:33:31 -07:00
snipe	6acce098c9	Added autoassign_licenses on user model ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 15:24:56 -07:00
snipe	bceb0b8a47	Allowed slightly longer zip codes ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-16 07:46:29 -07:00
snipe	6097d534e9	Added eloquent model relationships ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-13 11:10:16 -07:00
slong753	8b9aea8874	very much WIP, but dupe queries reduced ... but i think this can be cleaned up a bit more	2023-04-12 14:46:48 -05:00
snipe	74babfa081	Added maxlength="10" ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-12 08:26:36 -07:00
snipe	afd01869a5	Check for Carbon exception ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-11 23:35:41 -07:00
snipe	ffdc0d76f7	Fixed accessories verifying that enough remain to be checked out ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-06 18:40:29 -07:00
snipe	161999fbca	Fixed #12772 - use the APP_URL config more consistently ... Signed-off-by: snipe <snipe@snipe.net>	2023-04-05 16:05:40 -07:00
Marcus Moore	6df8f0f35c	Merge branch 'develop' into bug/sc-15034	2023-04-05 11:49:53 -07:00
slong753	3929526a57	ok, this works but needs to be tested more	2023-04-04 18:57:51 -05:00
slong753	8c1c0e81b6	rm deplicates	2023-03-30 13:31:58 -05:00
slong753	e126a75f7a	pretty sure this was it	2023-03-29 21:37:26 -05:00
Dominik Both	3271c9dc9f	Fix #8208, #8896, #8985, #9789	2023-03-29 09:56:34 +02:00
Marcus Moore	fa69a580ab	Start to scaffold license checkout notification test	2023-03-23 17:18:33 -07:00
Marcus Moore	2dcf4e3d16	Standardize on sending anonymous notifications for asset checkouts	2023-03-23 16:31:40 -07:00
Marcus Moore	fe6295a5e4	Update slack_* properties to webhook_*	2023-03-22 14:43:00 -07:00
snipe	473211397f	Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent ... Livewire importer without subcomponent	2023-03-21 23:07:04 -07:00
snipe	8dd3ae8a37	Corrected gates, added fillable ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-18 11:53:20 -07:00
snipe	7f8bdbd252	Added showableAssets() relationship to Category model ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-08 13:01:38 -08:00
Brady Wetherington	09c1298e03	Merge branch 'develop' into livewire_importer_2_squashed_and_rebased ... I'll be taking in the changes to the importer front-end elsewhere	2023-03-07 18:51:05 -08:00
snipe	ea54f540de	Dynamically determine target route for expected checkin emails ... Signed-off-by: snipe <snipe@snipe.net>	2023-03-07 13:42:51 -08:00
Godfrey M	e5deb4b413	doesn't allow months to be zero	2023-03-06 09:41:14 -08:00
Brady Wetherington	c48e19d236	Whoops, went a little overboard there. Whoopsie!	2023-02-28 22:51:48 -08:00
Brady Wetherington	f3c500014c	Another file I didn't really need to commit	2023-02-28 22:37:16 -08:00
Brady Wetherington	54cb38603b	Cleaned up the last of the FIXME's (or downgraded them to TODO's)	2023-02-28 22:34:44 -08:00
snipe	1f7ae08d76	Merge branch 'develop' into features/make_eol_sortable	2023-02-28 18:05:09 -08:00
snipe	2ab0abc8a1	Merge pull request #12575 from inietov/fixes/typeError_get_class_argument_must_be_object_null_given ... Fixed: TypeError: get_class(): Argument #1 ($object) must be of type object, null given	2023-02-28 16:45:53 -08:00
Ivan Nieto Vivanco	ad598425ef	Adds format to the dates cast	2023-02-28 17:24:14 -06:00
Ivan Nieto Vivanco	0d860c0b72	Check if target is not null to retrieve the proper data	2023-02-27 19:01:37 -06:00
Ivan Nieto Vivanco	b4e578c95e	Convert the alert_email setting from string to array	2023-02-27 17:34:29 -06:00
Brady Wetherington	0a085af0a0	Getting the basic wiring of the importer over into Livewire ... WIP: Wiring up more and more of the actions on the importer Files now upload okay, a little glitchy on the display-side though add to readmes so i dont forget	2023-02-27 14:28:59 -08:00
snipe	c7106a1df2	Added table aliases to fix ambiguous SQL clause ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-27 13:24:09 -08:00
Ivan Nieto Vivanco	6bd72125bd	Deletes problematic cast	2023-02-23 22:31:41 -06:00
snipe	8e72da42e8	Merge pull request #12406 from akemidx/vip_tag ... Added a checkbox to notate VIP status	2023-02-23 12:23:29 -08:00
snipe	5a1e5f740d	Merge pull request #12537 from inietov/fixes/expected_checkin_date_validation ... Fixed #12531 Expected Checkin Date on Asset Checkout throws an error	2023-02-22 16:03:51 -08:00
snipe	81cb29db5e	Merge pull request #12509 from inietov/fixes/add_images_to_user_inventory_mail_report ... Added images to emailed user inventory report [sc-19801]	2023-02-22 10:38:07 -08:00
snipe	05f6d0bd5e	Merge pull request #11984 from nh314/Correct-assignedusers-relation ... Correct assignedusers relation setting	2023-02-21 20:15:20 -08:00
snipe	0c3115553e	Merge branch 'develop' into vip_tag	2023-02-21 20:03:49 -08:00
Ivan Nieto Vivanco	d494afcf01	Add order by clause, to ensure assets and accessories are in order in the report	2023-02-21 21:24:19 -06:00
Ivan Nieto Vivanco	6e994c209f	Adds setter to model Asset class for expected checkin	2023-02-19 12:31:10 -06:00
snipe	754842f620	FML - this is a hotfix and I don’t know why this is causing problems ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-16 16:58:00 -08:00
snipe	e9ab90eafc	Merge pull request #12422 from marcusmoore/fix/adhere-to-email-alerts-setting ... Have acceptance result notifications adhere to alerts enabled setting	2023-02-15 18:46:08 -08:00
snipe	ff895739f4	Merge pull request #12446 from Godmartinz/livewire_slack_inputs ... Adds Livewire slack inputs	2023-02-15 13:27:07 -08:00
snipe	de4f7bd274	Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation ... Enforce Y-m-d as date format for date fields	2023-02-15 12:54:22 -08:00
snipe	25461caa2c	Removed date validation rule ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-15 12:53:55 -08:00
snipe	d52d32fed9	Fixed visibility for constants and methods ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-06 12:44:02 -08:00
snipe	1651dbb68d	Use null coalescing operator ... Signed-off-by: snipe <snipe@snipe.net>	2023-02-06 12:43:00 -08:00
snipe	d9cdb92014	Merge branch 'develop' into vip_tag	2023-02-01 16:03:23 -08:00
snipe	2da4578aa5	Merge branch 'develop' into slack_message	2023-02-01 13:43:09 -08:00
akemidx	90c1bfe03d	fixing pr	2023-02-01 16:12:39 -05:00
akemidx	4e5b8fa213	fixing pr	2023-02-01 16:05:50 -05:00
Marcus Moore	a45ce468cc	Update return type for routing mail notifications	2023-02-01 11:44:56 -08:00
Marcus Moore	3580bdae86	Use object accessor instead of array accessor	2023-02-01 11:44:35 -08:00
snipe	f7ae5db4f3	Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories	2023-01-31 19:56:43 -08:00
Godfrey M	fc044528b8	validation is working, success message appears, database is not updating	2023-01-30 16:10:02 -08:00
Marcus Moore	39289dd18e	Use user provided alert email for checkout acceptances	2023-01-26 13:18:18 -08:00
akemidx	df31a76906	fixed apostraphe	2023-01-26 15:02:39 -05: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
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
snipe	9c79fc19cb	Tightened up and removed some validation that wasn’t needed ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 17:37:15 -08:00
snipe	fd2a057d38	Make audit dates fillable ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 17:36:58 -08:00
snipe	3c4f254583	Enforce Y-m-d as date format for date fields ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-24 13:38:53 -08:00
akemidx	596846a94a	Add VIP Checkbox	2023-01-24 15:29:27 -05:00
cram42	c2c009a018	Merge branch 'develop' into develop	2023-01-24 09:53:42 +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	48c85966d7	Added gravatar and avatar as fillable ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 18:07:17 -08:00
snipe	dceb77d4d4	Refactored numRemaining, removed unnecessary numCheckout ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-21 14:40:20 -08:00
Marcus Moore	181f96ad33	Allow users to set a blank asset name during checkout	2023-01-19 12:35:44 -08:00
snipe	48b8cfcef9	Added byod to model, removed duplicate validation rule ... Signed-off-by: snipe <snipe@snipe.net>	2023-01-18 13:04:36 -08:00
snipe	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	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	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	2d0ac5b48b	The cache system in getSettings() cached values "forever." That's bad.	2023-01-09 16:16:09 -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	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
akemidx	94afe2bc6a	edits & typo fixes	2022-12-19 14:48:43 -05:00
akemidx	133d6ffa50	Commenting on a scope in Models/Company.php	2022-12-15 15:18:24 -05: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
akemidx	f3e57d7dc0	fixing PR	2022-12-13 16:00:59 -05: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
Ivan Nieto Vivanco	c082d8b90e	Return empty string if no MAIL_REPLYTO_ADDR var set	2022-11-23 18:22:31 -06:00
snipe	774962c122	Fixed typo ... Signed-off-by: snipe <snipe@snipe.net>	2022-11-17 21:14:35 +00: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
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
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	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	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	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
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	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	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
Brady Wetherington	4e5c878b73	Needed to fix the way we write externalId from SCIM	2022-10-31 19:15:08 -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
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	ac055c01dc	Use admin ID for audit log notification ... Signed-off-by: snipe <snipe@snipe.net>	2022-10-12 15:59:43 -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
Katharina Drexel	4f5d536e32	Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.	2022-09-28 14:52:02 +02:00
Katharina Drexel	8316a4eb92	Fixed: #11871 Replacing (deprecated) patchwork/utf8 by polyfill/mbstring.	2022-09-26 12:06:06 +02: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
snipe	ac4f91918e	Merge pull request #11771 from rnelsonee/PAT_test ... Fixed #11769: PAT Test hardcoded text	2022-09-14 20:01:18 -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
Rick Nelson	6e82de2f47	Fixed #11769: PAT Test hardcoded text	2022-09-01 11:21:02 -04: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
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	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
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	0172fe6403	Add Notifiable trait to the CheckoutAcceptance Model	2022-08-11 13:02:25 -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	acd666fdf5	Added notes to user consumables tab ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:34:07 -07:00
snipe	c1e5d03340	Added pivot for note ... Signed-off-by: snipe <snipe@snipe.net>	2022-08-10 15:03:41 -07: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
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
Katharina Drexel	9d627936e6	Fixed #11509: Allow LDAP anonymous bind.	2022-07-20 17:24:20 +02:00
Godfrey M	309229619b	fixes the order expiring assets are listed in notifications	2022-07-11 12:25:38 -07:00
snipe	92d46edca3	Cleaned up logging output ... Signed-off-by: snipe <snipe@snipe.net>	2022-07-01 13:33:58 -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
Brady Wetherington	2451bb9a2b	Make SCIM be more tolerant of missing fields	2022-06-29 14:48:59 -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	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	86d2c2b153	Small naming changes ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 19:11:59 -07:00
snipe	0bc3ca5c42	Fixed comments ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 18:44:27 -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	23c50ea9a5	Added admihn scopes ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-23 17:18:11 -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
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	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	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
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	7c77e03c5a	Initial rework of locations display ... Signed-off-by: snipe <snipe@snipe.net>	2022-06-05 18:08:15 -07: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	afb3843fad	Added sig and filename to acceptedCheckout method ... 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	adbac82c30	Removed stored_eula_file from actionlog ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-19 17:55:59 -07:00
Ivan Nieto Vivanco	5d29f77d60	Initialize result variable so return don't crash	2022-05-19 12:47:12 -05: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
snipe	deb2d958d8	Sets maxlength of user fields to 191 ... Signed-off-by: snipe <snipe@snipe.net>	2022-05-13 04:54:12 -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	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	1441cf9f4f	Ports #10494 to master ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-12 21:04:57 +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	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
snipe	01342ca266	Fixed activity report ... Signed-off-by: snipe <snipe@snipe.net>	2022-04-05 22:58:25 +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
snipe	a937bd34f6	Merge master back down into develop ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 16:28:43 +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
snipe	639409fb3f	Backporting #10829 to master ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-25 13:00:16 +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
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
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
Godfrey M	4956eb0410	WIP: needs to be tested. adds ldap_manager field to ldap sync	2022-03-21 11:15:39 -07: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
snipe	89ddbddada	Fixed comment ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-16 16:53:18 +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
Ivan Nieto Vivanco	e104195796	Convert value of the customfield element from string to boolean	2022-03-09 18:49:39 -06: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	43c1949092	Add remote option to user ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 05:35:26 -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	ac8a7d0bc9	Made notes field fillable and searchable ... Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:29:48 -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
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
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
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
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
snipe	5fded57ec6	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Console/Commands/LdapSync.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/ProfileController.php # app/Importer/ItemImporter.php # app/Importer/UserImporter.php # app/Models/Asset.php # app/Models/License.php # app/Providers/AppServiceProvider.php # app/Services/LdapAd.php # config/version.php # public/js/build/app.js # public/js/dist/all.js # public/mix-manifest.json # resources/lang/ar/button.php # resources/lang/de/admin/companies/general.php # resources/lang/de/admin/custom_fields/general.php # resources/lang/de/admin/groups/titles.php # resources/lang/de/admin/hardware/form.php # resources/lang/de/admin/hardware/general.php # resources/lang/de/admin/hardware/message.php # resources/lang/de/admin/hardware/table.php # resources/lang/de/admin/kits/general.php # resources/lang/de/admin/locations/table.php # resources/lang/de/admin/reports/general.php # resources/lang/de/admin/settings/general.php # resources/lang/de/admin/settings/message.php # resources/lang/de/admin/users/general.php # resources/lang/de/general.php # resources/lang/de/mail.php # resources/lang/en/admin/asset_maintenances/message.php # resources/lang/en/admin/asset_maintenances/table.php # resources/lang/en/admin/companies/general.php # resources/lang/en/admin/companies/message.php # resources/lang/en/admin/custom_fields/general.php # resources/lang/en/admin/depreciations/general.php # resources/lang/en/admin/groups/titles.php # resources/lang/en/admin/hardware/form.php # resources/lang/en/admin/hardware/general.php # resources/lang/en/admin/hardware/table.php # resources/lang/en/admin/kits/general.php # resources/lang/en/admin/locations/table.php # resources/lang/en/admin/reports/general.php # resources/lang/en/admin/settings/general.php # resources/lang/en/admin/settings/message.php # resources/lang/en/admin/users/general.php # resources/lang/en/button.php # resources/lang/en/general.php # resources/lang/en/help.php # resources/lang/en/mail.php # resources/lang/en/passwords.php # resources/lang/hu/admin/hardware/general.php # resources/lang/hu/admin/hardware/table.php # resources/lang/hu/admin/locations/table.php # resources/lang/is/admin/locations/table.php # resources/lang/ko/admin/custom_fields/general.php # resources/lang/ko/general.php # resources/lang/nl/admin/hardware/general.php # resources/lang/nl/admin/hardware/message.php # resources/lang/nl/admin/hardware/table.php # resources/lang/nl/admin/locations/table.php # resources/lang/nl/admin/statuslabels/message.php # resources/lang/nl/admin/users/general.php # resources/lang/no/admin/companies/general.php # resources/lang/no/admin/custom_fields/general.php # resources/lang/no/admin/depreciations/general.php # resources/lang/no/admin/depreciations/table.php # resources/lang/no/admin/groups/titles.php # resources/lang/no/admin/hardware/form.php # resources/lang/no/admin/hardware/general.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/locations/table.php # resources/lang/no/admin/reports/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/admin/settings/message.php # resources/lang/no/admin/statuslabels/message.php # resources/lang/no/admin/users/general.php # resources/lang/no/button.php # resources/lang/no/general.php # resources/lang/no/mail.php # resources/lang/no/validation.php # resources/lang/pl/admin/companies/general.php # resources/lang/pl/admin/custom_fields/general.php # resources/lang/pl/admin/depreciations/general.php # resources/lang/pl/admin/depreciations/table.php # resources/lang/pl/admin/groups/titles.php # resources/lang/pl/admin/hardware/form.php # resources/lang/pl/admin/hardware/general.php # resources/lang/pl/admin/hardware/table.php # resources/lang/pl/admin/kits/general.php # resources/lang/pl/admin/locations/table.php # resources/lang/pl/admin/reports/general.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/admin/settings/message.php # resources/lang/pl/admin/users/general.php # resources/lang/pl/button.php # resources/lang/pl/general.php # resources/lang/pt-PT/admin/companies/general.php # resources/lang/pt-PT/admin/custom_fields/general.php # resources/lang/pt-PT/admin/depreciations/general.php # resources/lang/pt-PT/admin/depreciations/table.php # resources/lang/pt-PT/admin/groups/titles.php # resources/lang/pt-PT/admin/hardware/form.php # resources/lang/pt-PT/admin/hardware/general.php # resources/lang/pt-PT/general.php # resources/lang/pt-PT/help.php # resources/lang/pt-PT/validation.php # resources/lang/ro/admin/companies/general.php # resources/lang/ro/admin/custom_fields/general.php # resources/lang/ro/admin/groups/titles.php # resources/lang/ro/admin/hardware/form.php # resources/lang/ro/admin/hardware/general.php # resources/lang/ro/admin/hardware/message.php # resources/lang/ro/admin/hardware/table.php # resources/lang/ro/admin/locations/table.php # resources/lang/ro/admin/settings/message.php # resources/lang/ru/admin/companies/general.php # resources/lang/ru/admin/custom_fields/general.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/general.php # resources/lang/ru/validation.php # resources/lang/sk/admin/settings/general.php # resources/lang/sk/button.php # resources/lang/sk/general.php # resources/lang/tr/admin/hardware/form.php # resources/lang/tr/admin/hardware/table.php # resources/lang/tr/admin/kits/general.php # resources/lang/tr/admin/locations/table.php # resources/lang/tr/admin/reports/general.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/admin/settings/message.php # resources/lang/tr/admin/statuslabels/message.php # resources/lang/tr/admin/users/general.php # resources/lang/tr/button.php # resources/lang/tr/general.php # resources/lang/zh-CN/admin/companies/general.php # resources/lang/zh-CN/admin/custom_fields/general.php # resources/lang/zh-CN/admin/depreciations/general.php # resources/lang/zh-CN/admin/depreciations/table.php # resources/lang/zh-CN/admin/groups/titles.php # resources/lang/zh-CN/admin/hardware/form.php # resources/lang/zh-CN/admin/hardware/general.php # resources/lang/zh-CN/admin/hardware/message.php # resources/lang/zh-CN/admin/hardware/table.php # resources/lang/zh-CN/admin/kits/general.php # resources/lang/zh-CN/admin/locations/table.php # resources/lang/zh-CN/admin/reports/general.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/admin/settings/message.php # resources/lang/zh-CN/admin/statuslabels/message.php # resources/lang/zh-CN/admin/users/general.php # resources/lang/zh-CN/button.php # resources/lang/zh-CN/general.php # resources/lang/zh-CN/mail.php # resources/views/depreciations/edit.blade.php	2022-02-01 18:53:05 -08:00
Ivan Nieto Vivanco	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
Brady Wetherington	ef463a37d8	Make 'pending' assets properly requestable; use requestable scope	2022-01-14 12:48:33 -08:00
snipe	ea83567e7d	Merge pull request #10494 from exula/fix/increase_max_licenses ... Fixed #7824	2022-01-10 15:04:47 -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
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	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
snipe	c3d55ee27e	Merge master down into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Exceptions/Handler.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/CustomFieldsController.php # app/Http/Controllers/SettingsController.php # app/Http/Transformers/AssetsTransformer.php # app/Models/Setting.php # config/version.php # resources/lang/af/button.php # resources/lang/ar/button.php # resources/lang/bg/button.php # resources/lang/cs/button.php # resources/lang/cy/button.php # resources/lang/da/button.php # resources/lang/de/button.php # resources/lang/el/button.php # resources/lang/en-GB/button.php # resources/lang/en-ID/button.php # resources/lang/es-CO/admin/groups/message.php # resources/lang/es-MX/button.php # resources/lang/et/admin/custom_fields/general.php # resources/lang/et/admin/hardware/table.php # resources/lang/et/admin/kits/general.php # resources/lang/et/admin/manufacturers/message.php # resources/lang/et/admin/models/general.php # resources/lang/et/admin/settings/general.php # resources/lang/et/button.php # resources/lang/et/mail.php # resources/lang/fa/button.php # resources/lang/fa/help.php # resources/lang/fi/button.php # resources/lang/fil/button.php # resources/lang/fr/button.php # resources/lang/ga-IE/button.php # resources/lang/he/button.php # resources/lang/hr/button.php # resources/lang/hu/admin/settings/general.php # resources/lang/hu/auth/message.php # resources/lang/hu/button.php # resources/lang/hu/mail.php # resources/lang/id/admin/hardware/table.php # resources/lang/id/button.php # resources/lang/it/button.php # resources/lang/iu/button.php # resources/lang/ja/button.php # resources/lang/ko/button.php # resources/lang/lt/button.php # resources/lang/lv/button.php # resources/lang/mi/button.php # resources/lang/mk/button.php # resources/lang/ml-IN/button.php # resources/lang/mn/button.php # resources/lang/ms/admin/hardware/table.php # resources/lang/ms/admin/kits/general.php # resources/lang/ms/admin/models/general.php # resources/lang/ms/admin/models/message.php # resources/lang/ms/admin/settings/general.php # resources/lang/ms/button.php # resources/lang/nl/button.php # resources/lang/no/admin/hardware/table.php # resources/lang/no/admin/kits/general.php # resources/lang/no/admin/settings/general.php # resources/lang/no/auth/message.php # resources/lang/no/button.php # resources/lang/no/help.php # resources/lang/no/mail.php # resources/lang/pl/button.php # resources/lang/pt-BR/button.php # resources/lang/pt-PT/auth/message.php # resources/lang/pt-PT/button.php # resources/lang/pt-PT/mail.php # resources/lang/ro/button.php # resources/lang/ru/admin/settings/general.php # resources/lang/ru/button.php # resources/lang/ru/help.php # resources/lang/sl/admin/custom_fields/general.php # resources/lang/sl/admin/hardware/table.php # resources/lang/sl/admin/kits/general.php # resources/lang/sl/admin/manufacturers/message.php # resources/lang/sl/admin/models/general.php # resources/lang/sl/admin/settings/general.php # resources/lang/sl/admin/users/general.php # resources/lang/sl/auth/message.php # resources/lang/sl/button.php # resources/lang/sl/help.php # resources/lang/sr-CS/button.php # resources/lang/ta/button.php # resources/lang/th/button.php # resources/lang/th/mail.php # resources/lang/tl/button.php # resources/lang/tr/admin/settings/general.php # resources/lang/tr/auth/message.php # resources/lang/tr/button.php # resources/lang/uk/button.php # resources/lang/ur-PK/button.php # resources/lang/vi/button.php # resources/lang/zh-CN/button.php # resources/lang/zh-HK/button.php # resources/lang/zh-TW/admin/hardware/table.php # resources/lang/zh-TW/button.php # resources/lang/zu/button.php # resources/views/models/custom_fields_form.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/slack.blade.php	2021-12-16 14:26:24 -08:00
snipe	ff97b359ad	Removed form request on ajax, cleaned up some other things ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:58:46 -08:00
snipe	6d84482104	Merge pull request #10388 from snipe/features/switch_to_dusk ... WIP - Fixing unit tests, switching to dusk	2021-12-06 14:19:36 -08:00
snipe	ebdbc20740	Adds stricter validation for slack endpoints ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-06 11:40:24 -08:00
snipe	00b63fe7c7	Fixed category factory methods ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 13:40:16 -08:00
snipe	f2f8f96991	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # app/Http/Controllers/Api/AssetsController.php # app/Http/Transformers/AssetsTransformer.php # app/Importer/ConsumableImporter.php # app/Models/Consumable.php # config/version.php # package-lock.json # package.json # 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/views/custom_fields/fieldsets/view.blade.php # resources/views/layouts/default.blade.php # routes/web.php # routes/web/fields.php	2021-11-15 19:24:38 -08:00
Brady Wetherington	864cc4f8d5	Fix FIXME's by downgrading them to TODO's :)	2021-11-10 11:37:10 -08:00
Brady Wetherington	91f087258b	Merge branch 'develop' into remove_old_ldap	2021-11-09 18:33:41 -08:00