3883 commits

Author	SHA1	Message	Date
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
Alex Janes	bc4fe88ac0	First version of bulk checkin	2021-12-19 16:53:31 -05:00
Alex Janes	a68ec8bb57	Update LoginController.php ... Updated if statements to match convention exactly.	2021-12-17 18:52:42 -05:00
Alex Janes	74de91c31a	Merge pull request #1 from snipe/develop ... Develop	2021-12-17 14:51:03 -05:00
snipe	9b2dd6522f	Switch GET to POST for asset request ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 20:36:08 -08:00
Alex Janes	d99db5c63b	bug fix and formatting fix	2021-12-16 19:04:37 -05:00
snipe	398180dc59	Small merge unmagling ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-16 14:38:04 -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
Alex Janes	6898119891	Replaced env() with config() to check environment variables ... Made the app.php description for 'REQUIRE_SAML' a bit more... descriptive.	2021-12-16 16:56:39 -05:00
Alex Janes	a6116a1b15	If SAML required, don't accept login form post.	2021-12-16 14:33:25 -05:00
Alex Janes	3c8d70c5fb	Add option to environment to require SAML for a more secure installation.	2021-12-16 11:44:07 -05:00
Bradley Coudriet	dbdc1c7f3f	Update SettingsController.php to save Slack Settings ... This goes with #10438 that I just submitted about Slack Settings not saving. This adds the necessary code to actually save the Slack Settings, As they are already validated by the SlackSettingsRequest, this seems like an easy and low-impact fix.	2021-12-15 10:38:51 -05:00
Ivan Nieto Vivanco	c80aa2a289	Add title column to custom reports	2021-12-14 12:05:33 -06:00
Ivan Nieto Vivanco	0037cdb00c	Add title column to custom reports	2021-12-13 20:27:23 -06:00
snipe	25e2e7ecc6	Merge pull request #10418 from inietov/fixes/bulk_edit_count_more_users_than_selected ... Fixes bulk edit message counts more users than the actual selected users number	2021-12-13 14:13:14 -08:00
snipe	9d5d1a9f9a	Added escape to assigned_to API response ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-13 12:03:03 -08:00
Ivan Nieto Vivanco	a419a690d4	Add a variable to better control the selected user's ids	2021-12-11 18:01:38 -06:00
Brady Wetherington	ea71086dfc	Yank assetlog from eager-load clause in API query for develop	2021-12-10 18:50:34 -08:00
Brady Wetherington	acfb41f129	Remove 'actionlog' from the ::with() clause in the asset query API	2021-12-10 18:42:56 -08:00
Haxatron	1699c09758	Update AssetModelsController.php	2021-12-09 21:42:18 +08:00
Haxatron	918e7c8dae	Fix access control - https://huntr.dev/bounties/19453ef1-4d77-4cff-b7e8-1bc8f3af0862/	2021-12-09 12:57:04 +08:00
snipe	86afe6c4b1	Cleanup slack validation ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 18:03:56 -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	81b66d0039	Change validation failure to 422 to make it consistent with Laravel's default ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:54:35 -08:00
snipe	8fa690b635	Reverting form request because it doesn't seem to work (????!!) ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 17:54:15 -08:00
snipe	8c1cd87831	Added slacksettingsrequest as use statement ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:56:22 -08:00
snipe	80d36cd72b	Added slack settings request ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-08 15:53:05 -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	f334bf1058	Fixed notification tests ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 20:01:03 -08:00
snipe	00b63fe7c7	Fixed category factory methods ... Signed-off-by: snipe <snipe@snipe.net>	2021-12-02 13:40:16 -08:00
snipe	cae62fd4c7	Merge pull request #9902 from SidingsMedia/sum_cost_by_quantity ... Fixed #5676: Sum cost by quantity	2021-12-02 12:13:04 -08:00
snipe	d08c1787a1	First steps at getting dusk working ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-30 20:09:29 -08:00
snipe	ff81e6d536	Merge pull request #10361 from snipe/fixes/xss_in_accessories_checkout_notes ... Escape notes in transformCheckedOutAccessory	2021-11-24 19:56:36 -08:00
snipe	00fad35c2a	Escape notes in transformCheckedOutAccessory ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-24 19:54:45 -08:00
snipe	3debe78574	Merge pull request #10350 from inietov/fixes/trim_custom_fields_names ... Apply trim() function when storing Custom Fields names	2021-11-24 19:42:04 -08:00
snipe	29bbfad693	Applied escaping fix from master to develop ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-24 19:38:27 -08:00
snipe	830d07f84f	Removed escaping on input save for asset checkout on creation ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-24 19:19:32 -08:00
Ivan Nieto Vivanco	1ca770895a	Apply trim() function when storing Custom Fields names	2021-11-22 18:43:21 -06:00
Matthew Nickson	9381ba2404	Merge branch 'develop' into sum_cost_by_quantity	2021-11-21 18:59:34 +00:00
Brady Wetherington	e8f5dc85a6	Downgraded a FIXME to a TODO	2021-11-19 16:38:46 -08:00
snipe	c49c5f4164	Added text-right to presenters for money values ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-18 15:09:17 -08:00
snipe	bbb0d1be17	Possible fix for asset model editing when no custom fieldset is associated ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 21:09:35 -08:00
snipe	f7b483358f	Escape custom field values in API response ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 20:32:59 -08:00
snipe	476e17055b	Escape custom fields in API response ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 20:31:01 -08:00
snipe	46d2f8a81d	Disallow file upload to backups on demo ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:42:02 -08:00
snipe	92b7aaf44b	Log the user out upon successful restore ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-15 19:40:01 -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	c2b5f9b372	Cleaned up the output and added some better checks for errors	2021-11-10 17:08:04 -08:00
Brady Wetherington	2b6614e2dd	Tweak Restore command to _also_ run via webserver via Artisan::call()	2021-11-10 12:44:19 -08:00
Brady Wetherington	864cc4f8d5	Fix FIXME's by downgrading them to TODO's :)	2021-11-10 11:37:10 -08:00
snipe	457c6080cc	Better handling if there was no file uploaded ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 01:43:45 -08:00
snipe	76685d7fd3	Clearer text in restore artisan command ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:07:32 -08:00
snipe	96f76e1f6b	INCOMPLETE: Added restore and upload methods for backups ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-10 00:07:17 -08:00
snipe	3b25093aeb	Removed noisy debugging ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:38:27 -08:00
snipe	76506dabbf	Made helpers call full namespace (tho I have no idea why this was necessary) ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:38:14 -08:00
snipe	1b1b54fbf4	Add modified_value and modified_display so we can use the formatted date but still sort correctly ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 22:37:49 -08:00
snipe	0e21a95817	Escape error message in asset autdit apI (same as in v5) ... Signed-off-by: snipe <snipe@snipe.net>	2021-11-09 19:39:32 -08:00
Brady Wetherington	91f087258b	Merge branch 'develop' into remove_old_ldap	2021-11-09 18:33:41 -08:00
Brady Wetherington	3ea209a507	Escape asset_tag attribute at controller level for consumption in bulk checkout	2021-11-08 20:27:43 -08:00
Brady Wetherington	a58c5ce27f	Better documentation, disable AdLdap2-based "Add domain" setting	2021-11-08 17:11:47 -08:00
Brady Wetherington	b0417e5bd7	Finish pulling out the AdLdap2-based LDAP remnants that were still in the system	2021-11-03 15:22:06 -07:00
Terrell Eaton	2c7a71a2a1	Fixes not being able to search by checked out user in advanced search	2021-11-01 22:14:19 +01:00
Brady Wetherington	4dda28de9e	WIP: cleaning up LDAP	2021-10-28 18:19:50 -07:00
Brady Wetherington	31933a56fa	Trying to get the login screen working	2021-10-28 18:18:11 -07:00
snipe	ea0d92c439	Merge branch 'develop' into fixes/fmcs_departments	2021-10-28 18:18:08 -07:00
snipe	d36849bd41	Merge branch 'develop' into feature/remove_deleted_user_from_unaccepted_assets_report	2021-10-28 18:11:03 -07:00
snipe	84a3a85823	Fixed parse error for merge conflict ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 18:04:03 -07:00
snipe	798f6d65de	Merge pull request #9847 from inietov/bug/ch15357/requested_assets_allow_to_cancel_if_checkedout_to_self ... Adds a check to know if the asset is checked out to the logged in user to allow check the state in the view	2021-10-28 17:53:24 -07:00
snipe	76cc46c419	Merge pull request #9814 from 01ste02/importMinAmt ... Improved Consumable Import: Import min_amt for consumables	2021-10-28 17:49:44 -07:00
snipe	bdf321ecc9	Merge branch 'develop' into change-var-aws-public-url	2021-10-28 17:46:16 -07:00
snipe	645529ba78	Merge pull request #9889 from ncareau/api-licenses ... Add licenses api parameters and fix a missing variable in license view.	2021-10-28 17:20:09 -07:00
snipe	2f9e5f79af	Merge pull request #10139 from FliegenKLATSCH/patch-1 ... API: Do not include deleted items per default on lookup by serial	2021-10-28 17:09:20 -07:00
snipe	3088230236	Merge pull request #10209 from Godmartinz/feature/sc-1474/sync-parent-asset-location-with-children-assets ... Fixes Bug: When parent asset is assigned to other location, children assets loca…	2021-10-28 16:49:44 -07:00
snipe	371a39a118	Merge branch 'develop' into fixes/advanced_search_serial_v2	2021-10-28 16:42:10 -07:00
snipe	7821d38e60	Merge pull request #10238 from inietov/fixes/asset_components_must_return_relationship_instance ... Fixes asset components must return relationship instance	2021-10-28 16:38:21 -07:00
snipe	1895dd326f	Merge pull request #10245 from Sxderp/pr-support-appache-rewrite-redirect-headers-for-remote-user ... support apache REDIRECT_* for remote user login	2021-10-28 16:34:57 -07:00
snipe	52ef9280ba	Adds reqestable as model bulk edit field ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-28 15:15:54 -07:00
Steven Daniele	efc644c960	support apache REDIRECT_* for remote user login	2021-10-28 14:23:38 -04:00
Ivan Nieto Vivanco	ee9133f722	Return the proper Asset-Components relationship	2021-10-27 16:42:51 -05:00
snipe	17bf899a17	Set default_label to 0 instead of null in API ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 20:14:01 -07:00
snipe	8b1c60a17a	Make gates a little more consistent ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 15:34:22 -07:00
snipe	033c3253bb	Fixed permissions array to handle missing clone button ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-25 14:10:17 -07:00
Ivan Nieto Vivanco	9eaf89aaa7	Add a variable to better control the selected user's ids	2021-10-21 13:28:58 -05:00
snipe	31d49b5c9b	Fixed merge error parse error ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 18:11:34 -07:00
snipe	6e0f8068b2	Fixed duplicate use statement from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:54:32 -07:00
snipe	9ee13f0d2a	Fixed dupe use statement from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:53:43 -07:00
snipe	ae1a4bb3c9	Fixed extra braces from merge fuckery ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-20 17:36:06 -07:00
snipe	aa8f1378c9	Merge remote-tracking branch 'origin/master' into develop ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # README.md # app/Http/Controllers/Accessories/AccessoriesController.php # app/Http/Controllers/Api/AssetMaintenancesController.php # app/Http/Controllers/Api/AssetModelsController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Assets/AssetFilesController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Assets/BulkAssetsController.php # app/Http/Controllers/Components/ComponentsController.php # app/Http/Controllers/Consumables/ConsumablesController.php # app/Http/Controllers/Licenses/LicenseFilesController.php # app/Http/Controllers/Licenses/LicensesController.php # app/Http/Controllers/Users/UserFilesController.php # app/Http/Transformers/AssetsTransformer.php # app/Http/Transformers/LicensesTransformer.php # app/Importer/UserImporter.php # app/Models/Asset.php # config/app.php # config/version.php # package-lock.json # public/js/build/app.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/lang/en/admin/users/message.php # resources/lang/is/button.php # resources/lang/ja/admin/kits/general.php # resources/lang/ro/admin/users/general.php # resources/lang/zh-HK/admin/depreciations/general.php # resources/lang/zh-HK/admin/models/general.php # resources/views/hardware/qr-view.blade.php # resources/views/hardware/view.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/users/view.blade.php # routes/web.php # routes/web/hardware.php # routes/web/models.php # routes/web/users.php	2021-10-20 17:26:41 -07:00
Godfrey M	9ae7d0b23a	when parent asset is assigned to other location, children assets location are updated as well.	2021-10-20 17:01:25 -07:00
Matthew Nickson	8996c24d1f	Merge branch 'develop' into sum_cost_by_quantity	2021-10-10 13:01:44 +01:00
FliegenKLATSCH	24c484303e	Do not include deleted assets by default when doing lookup by serial ... This commit introduces a new query parameter `deleted`, which can be set to `true` to include deleted assets in the response.	2021-10-09 08:56:31 +02:00
snipe	5d94b99035	Switched to 5 in one minute ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 15:53:32 -07:00
snipe	0674ef5a3d	Fixed number to 1 (for minutes) ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 15:43:32 -07:00
snipe	702791210e	Throttle password reset requests to 5 every 60 seconds ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-08 14:26:30 -07:00
Ivan Nieto Vivanco	23b770fac6	Added a validation to use the same name in categories with different types	2021-10-08 15:19:16 -05:00
snipe	1c77fd0d09	Merge pull request #10178 from inietov/bug/sc-17520/symfony_component_debug_exception_fatalthrowableerror ... Fixed typo when setting the headers	2021-10-08 12:04:45 -07:00
Ivan Nieto Vivanco	d184da8611	Fixed typo (thanks @ssddanbrown)	2021-10-08 13:39:49 -05:00
Dampfklon	ab4a234e20	fix rebase errors	2021-10-07 21:32:57 +02:00
Dampfklon	7645f23f5c	remove pending Acceptances on checkin	2021-10-07 21:03:46 +02:00
Dampfklon	4418ad2340	Enable display of deleted acceptances, strike deleted users, add date, enable sorting	2021-10-07 21:03:46 +02:00
Dampfklon	12ee06deb6	add Download All Button, change route analogue to activity report	2021-10-07 21:01:50 +02:00
Dampfklon	9a9ca59544	Fix decprecated implode usage	2021-10-07 20:55:47 +02:00
Dampfklon	ed99532c30	Unaccepted Assets Report Actions (send reminder, delete) added ... Unaccepted Assets Export fixed	2021-10-07 20:53:02 +02:00
snipe	ccd430ce07	Switched back down to debug level ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:38:21 -07:00
snipe	f306401e7e	Fixed SVG XSS vuln ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 12:26:45 -07:00
snipe	c06a93ef13	Removed extra brace in assets for components ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-06 10:38:13 -07:00
Ivan Nieto Vivanco	ef6eea67d8	Set headers in a different manner in the middleware	2021-10-05 14:09:35 -05:00
Brady Wetherington	bbeedc026d	A lot of cleanups to the Livewire stuff, and got it kinda-sorta basically working.	2021-10-04 22:07:29 -07:00
Brady Wetherington	d80604f2ac	Most of the basics are working, but not done and lots of debug messages are about ... I picked up the change that picked a point-release difference on the AWS library since that usually works out for us (x.y.1 vs. x.y.2 - usually a good call)	2021-10-04 22:06:48 -07:00
snipe	34eab88b7e	Removed debugging ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 20:25:31 -07:00
snipe	b20c841a89	Fixed asset models restore ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 19:29:13 -07:00
snipe	52caee2a9f	Handle checking and unchecking for bulk actions ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:26 -07:00
snipe	52ea172e5d	Fix ID array ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 17:18:07 -07:00
snipe	9b48732cd2	Force revalidation headers when user logs out ... Signed-off-by: snipe <snipe@snipe.net>	2021-10-04 12:52:48 -07:00
snipe	daa88f06f7	Added pivot to components JSON ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-30 15:51:08 -07:00
snipe	d0acb9fdb4	Applies PR #10150 to master ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-30 15:33:00 -07:00
Ivan Nieto Vivanco	11aa8971c8	Fix error if the Department is also empty	2021-09-30 17:20:44 -05:00
Ivan Nieto Vivanco	5c7aaaac22	Fix error when department is null	2021-09-30 16:46:23 -05:00
snipe	61f16f47a2	Use Helper alias ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-28 19:44:55 -07:00
Brady Wetherington	ae466be153	Fix license output, tweak CleanFloat function to handle numbers over 1 million	2021-09-28 19:10:25 -07:00
Brady Wetherington	f3338667c7	Create new ParseCurrency helper and use it in the appropriate controllers	2021-09-28 18:20:39 -07:00
Brady Wetherington	f380da3f19	Try to ensure all currency output is formatted correctly.	2021-09-28 16:45:47 -07:00
NMC	c680977791	Merge branch 'develop' into api-licenses	2021-09-27 15:02:51 -04:00
snipe	d88c0ae5ec	Merge pull request #10103 from snipe/fixes/make_boolean_fields_nullable ... Fixed issue when creating a status label via API - default_label and show_in_nav being not nullable	2021-09-26 13:41:52 -07:00
snipe	7e41c74cc3	Updated more fa icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-26 01:11:08 -07:00
snipe	67d898e897	Updated map icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 14:30:36 -07:00
snipe	e03d7b7016	More fa icon updates ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 13:07:02 -07:00
snipe	ad6f073c82	Few more icon updates ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:38:23 -07:00
snipe	dbe93d91cd	Updated fontawesome icons ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-24 06:07:46 -07:00
snipe	2f9582ee5c	Switched to loadMissing for performance ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:31:19 -07:00
snipe	3b7ce0091c	Load components in the assets API if components=true in API request ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:23:53 -07:00
snipe	6e270c0ed2	Include created_at in pivot ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-23 17:23:17 -07:00
snipe	3862b6476b	Merge pull request #10122 from inietov/fixes/api_issue_when_component_checkout ... Fixes API Issue when checking out a component	2021-09-23 13:21:48 -07:00
Ivan Nieto Vivanco	7dfab3a6e2	Change the condition to 'bigger or equal' instead of just 'bigger than' in ComponentsController checkout api	2021-09-23 15:02:39 -05:00
snipe	a6b3aa5f04	Don't try to delete the file if there is no log entry ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 19:04:25 -07:00
snipe	61cf9ec009	Small conflict handling bits ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-22 00:00:44 -07:00
snipe	e27065fe16	Merge branch 'develop-v6-integration' into develop-v6-rc1 ... Signed-off-by: snipe <snipe@snipe.net> # Conflicts: # .all-contributorsrc # README.md # app/Console/Commands/ResetDemoSettings.php # app/Helpers/Helper.php # app/Http/Controllers/Api/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/CategoriesController.php # app/Http/Controllers/Api/ComponentsController.php # app/Http/Controllers/Api/ConsumablesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/StatuslabelsController.php # app/Http/Controllers/Api/SuppliersController.php # app/Http/Controllers/AssetMaintenancesController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/DepreciationsController.php # app/Http/Controllers/ReportsController.php # app/Http/Controllers/SettingsController.php # app/Http/Requests/ImageUploadRequest.php # app/Http/Transformers/ActionlogsTransformer.php # app/Http/Transformers/DepreciationsTransformer.php # app/Listeners/CheckoutableListener.php # app/Models/Accessory.php # app/Models/Asset.php # app/Models/Company.php # app/Models/Ldap.php # app/Models/User.php # app/Presenters/AssetPresenter.php # app/Presenters/CategoryPresenter.php # composer.json # composer.lock # config/version.php # database/factories/AssetModelFactory.php # database/migrations/2020_10_22_233743_move_accessory_checkout_note_to_join_table.php # database/seeds/AssetModelSeeder.php # package-lock.json # public/css/build/AdminLTE.css # public/css/build/app.css # public/css/build/overrides.css # public/css/dist/all.css # public/css/dist/bootstrap-table.css # public/css/dist/skins/skin-black-dark.css # public/css/dist/skins/skin-black-dark.min.css # public/css/dist/skins/skin-black.css # public/css/dist/skins/skin-black.min.css # public/css/dist/skins/skin-blue-dark.css # public/css/dist/skins/skin-blue-dark.min.css # public/css/dist/skins/skin-blue.css # public/css/dist/skins/skin-blue.min.css # public/css/dist/skins/skin-contrast.css # public/css/dist/skins/skin-contrast.min.css # public/css/dist/skins/skin-green-dark.css # public/css/dist/skins/skin-green-dark.min.css # public/css/dist/skins/skin-green.css # public/css/dist/skins/skin-green.min.css # public/css/dist/skins/skin-orange-dark.css # public/css/dist/skins/skin-orange-dark.min.css # public/css/dist/skins/skin-orange.css # public/css/dist/skins/skin-orange.min.css # public/css/dist/skins/skin-purple-dark.css # public/css/dist/skins/skin-purple-dark.min.css # public/css/dist/skins/skin-purple.css # public/css/dist/skins/skin-purple.min.css # public/css/dist/skins/skin-red-dark.css # public/css/dist/skins/skin-red-dark.min.css # public/css/dist/skins/skin-red.css # public/css/dist/skins/skin-red.min.css # public/css/dist/skins/skin-yellow-dark.css # public/css/dist/skins/skin-yellow-dark.min.css # public/css/dist/skins/skin-yellow.css # public/css/dist/skins/skin-yellow.min.css # public/js/build/app.js # public/js/build/vendor.js # public/js/dist/all.js # public/js/dist/bootstrap-table.js # public/mix-manifest.json # resources/assets/js/vue.js # resources/lang/af/validation.php # resources/lang/ar/admin/settings/general.php # resources/lang/ar/validation.php # resources/lang/bg/admin/settings/general.php # resources/lang/bg/validation.php # resources/lang/cs/admin/settings/general.php # resources/lang/cs/validation.php # resources/lang/cy/help.php # resources/lang/cy/validation.php # resources/lang/da/admin/settings/general.php # resources/lang/da/validation.php # resources/lang/de/admin/settings/general.php # resources/lang/de/validation.php # resources/lang/el/validation.php # resources/lang/en-GB/admin/settings/general.php # resources/lang/en-GB/validation.php # resources/lang/en-ID/admin/hardware/table.php # resources/lang/en-ID/admin/settings/general.php # resources/lang/en-ID/validation.php # resources/lang/es-CO/admin/settings/general.php # resources/lang/es-CO/auth/message.php # resources/lang/es-CO/button.php # resources/lang/es-CO/help.php # resources/lang/es-CO/validation.php # resources/lang/es-ES/admin/settings/general.php # resources/lang/es-ES/auth/message.php # resources/lang/es-ES/button.php # resources/lang/es-ES/help.php # resources/lang/es-ES/validation.php # resources/lang/es-MX/admin/settings/general.php # resources/lang/es-MX/validation.php # resources/lang/es-VE/admin/settings/general.php # resources/lang/es-VE/auth/message.php # resources/lang/es-VE/button.php # resources/lang/es-VE/help.php # resources/lang/es-VE/validation.php # resources/lang/et/validation.php # resources/lang/fa/validation.php # resources/lang/fi/admin/settings/general.php # resources/lang/fi/validation.php # resources/lang/fil/validation.php # resources/lang/fr/admin/settings/general.php # resources/lang/fr/validation.php # resources/lang/ga-IE/validation.php # resources/lang/he/admin/settings/general.php # resources/lang/he/general.php # resources/lang/he/validation.php # resources/lang/hr/validation.php # resources/lang/hu/validation.php # resources/lang/id/validation.php # resources/lang/is/admin/categories/general.php # resources/lang/is/admin/companies/message.php # resources/lang/is/admin/companies/table.php # resources/lang/is/admin/components/general.php # resources/lang/is/admin/components/table.php # resources/lang/is/admin/consumables/table.php # resources/lang/is/admin/depreciations/general.php # resources/lang/is/admin/depreciations/message.php # resources/lang/is/admin/hardware/form.php # resources/lang/is/admin/hardware/general.php # resources/lang/is/admin/hardware/message.php # resources/lang/is/admin/hardware/table.php # resources/lang/is/admin/kits/general.php # resources/lang/is/admin/licenses/form.php # resources/lang/is/admin/licenses/general.php # resources/lang/is/admin/locations/table.php # resources/lang/is/admin/manufacturers/table.php # resources/lang/is/admin/reports/message.php # resources/lang/is/admin/settings/general.php # resources/lang/is/admin/settings/message.php # resources/lang/is/admin/statuslabels/message.php # resources/lang/is/admin/suppliers/message.php # resources/lang/is/admin/suppliers/table.php # resources/lang/is/admin/users/table.php # resources/lang/is/mail.php # resources/lang/is/validation.php # resources/lang/it/admin/settings/general.php # resources/lang/it/validation.php # resources/lang/iu/validation.php # resources/lang/ja/mail.php # resources/lang/ja/validation.php # resources/lang/ko/validation.php # resources/lang/lt/validation.php # resources/lang/lv/validation.php # resources/lang/mi/validation.php # resources/lang/mk/validation.php # resources/lang/ml-IN/validation.php # resources/lang/mn/validation.php # resources/lang/ms/validation.php # resources/lang/nl/admin/settings/general.php # resources/lang/nl/validation.php # resources/lang/no/validation.php # resources/lang/pl/admin/settings/general.php # resources/lang/pl/validation.php # resources/lang/pt-BR/admin/settings/general.php # resources/lang/pt-BR/mail.php # resources/lang/pt-BR/validation.php # resources/lang/pt-PT/validation.php # resources/lang/ro/validation.php # resources/lang/ru/validation.php # resources/lang/sl/validation.php # resources/lang/sr-CS/admin/settings/general.php # resources/lang/sr-CS/validation.php # resources/lang/sv-SE/admin/settings/general.php # resources/lang/sv-SE/auth/message.php # resources/lang/sv-SE/button.php # resources/lang/sv-SE/mail.php # resources/lang/sv-SE/validation.php # resources/lang/ta/validation.php # resources/lang/th/validation.php # resources/lang/tl/validation.php # resources/lang/tr/mail.php # resources/lang/tr/validation.php # resources/lang/uk/admin/accessories/table.php # resources/lang/uk/admin/asset_maintenances/message.php # resources/lang/uk/admin/asset_maintenances/table.php # resources/lang/uk/validation.php # resources/lang/ur-PK/validation.php # resources/lang/vi/admin/settings/general.php # resources/lang/vi/validation.php # resources/lang/zh-CN/admin/settings/general.php # resources/lang/zh-CN/validation.php # resources/lang/zh-HK/validation.php # resources/lang/zh-TW/validation.php # resources/lang/zu/validation.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/company-select.blade.php # routes/api.php	2021-09-21 23:46:50 -07:00
snipe	b4a90045e6	Added totals to depreciation report footer ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 21:52:18 -07:00
snipe	0763c76a4e	Fixed scoping with leftjoin ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 20:54:24 -07:00
snipe	5d32c17a2e	Removed comments ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 20:01:36 -07:00
snipe	10ca7cffc3	Fixes for query scoping, ordering, and nicer readability ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 19:59:23 -07:00
snipe	61176335d7	Improved category_type with strtolower() to make it case insensitive ... Signed-off-by: snipe <snipe@snipe.net>	2021-09-21 15:51:41 -07:00
Delta5	c8c3c7fbbd	Fixed issue with incorrect error message	2021-09-21 19:45:18 +00:00