2616 Commits

Author	SHA1	Message	Date
miguel angel rasteu	bb3a45050f	Merge branch 'develop' into ent-10637-mejora-informe-grupo	2023-08-24 12:38:23 +02:00
daniel	dca15b5637	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-08-23 18:54:01 +02:00
miguel angel rasteu	330f36a3cf	Fix group view	2023-08-22 13:23:17 +02:00
miguel angel rasteu	feac240905	#10637 Resolve conflicts	2023-08-22 11:49:23 +02:00
alejandro.campos@artica.es	5624b8256c	several changes	2023-08-22 10:29:58 +02:00
Jonathan	563323d0be	#11852 warning time lapse more than 30 days	2023-08-21 13:05:39 +02:00
daniel	a63824d802	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria ... Conflicts: pandora_console/extras/mr/66.sql pandora_console/godmode/users/user_management.php	2023-08-21 08:08:34 +02:00
Rafael Ameijeiras	dbd90d79a7	Merge branch 'ent-10344-conexion-con-el-servidor-se-ha-perdido' into 'develop' ... Ent 10344 Conexion con el servidor se ha perdido See merge request artica/pandorafms!6228	2023-08-21 05:58:32 +00:00
Rafael Ameijeiras	52d37be6c9	Merge branch 'ent-10850-meter-la-vista-actual-de-la-vista-detalle-de-agentes-en-el-sistema-de-favoritos' into 'develop' ... Ent 10850 meter la vista actual de la vista detalle de agentes en el sistema de favoritos See merge request artica/pandorafms!6196	2023-08-18 06:52:31 +00:00
daniel	133eef456a	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-08-14 08:14:34 +02:00
Daniel Cebrian	06eae47560	Merge branch 'develop' into ent-11326-security-hardening-console	2023-08-09 13:27:21 +02:00
daniel	7f82273dc4	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria ... Conflicts: pandora_console/extras/mr/65.sql	2023-08-09 08:59:01 +02:00
Rafael Ameijeiras	0b680568b5	Merge branch 'ent-11739-compatibilidad-php-8-2-second' into 'develop' ... Ent 11739 compatibilidad php 8 2 second See merge request artica/pandorafms!6300	2023-08-04 06:32:37 +00:00
Rafael Ameijeiras	fec85ce8e7	Merge branch 'ent-11749-15964-conteo-de-agentes-no-aparece-en-v772' into 'develop' ... Ent 11749 15964 conteo de agentes no aparece en v772 See merge request artica/pandorafms!6266	2023-08-03 07:04:11 +00:00
Daniel Maya	aef7f0edd0	#11739 Fixed deprecated functions 4	2023-08-01 14:51:31 +02:00
alejandro.campos@artica.es	8fdc841254	Merge remote-tracking branch 'origin/develop' into ent-10602-Inventory-Widget	2023-08-01 09:58:37 +02:00
alejandro.campos@artica.es	78e76e1ad3	implemented inventory widget	2023-08-01 09:57:49 +02:00
Daniel Cebrian	21435b32c3	Merge branch 'develop' into ent-11326-security-hardening-console	2023-07-28 13:39:22 +02:00
Pablo Aragon	0eb60cf5c8	11174-Timezone iana graph firefox	2023-07-27 11:24:52 +02:00
Daniel Cebrian	001ffc1799	Merge branch 'develop' into ent-11326-security-hardening-console	2023-07-26 10:55:49 +02:00
Rafael Ameijeiras	0e6531b983	Merge branch 'ent-11335-se-pueden-crear-mapas-de-red-con-el-mismo-nombre-y-grupo' into 'develop' ... Ent 11335 Se pueden crear mapas de red con el mismo nombre y grupo See merge request artica/pandorafms!6143	2023-07-25 07:53:15 +00:00
Rafael Ameijeiras	25e2183d23	Merge branch 'ent-11726-15939-no-hay-columna-nombre-del-agente' into 'develop' ... Ent 11726 15939 no hay columna nombre del agente See merge request artica/pandorafms!6240	2023-07-25 07:51:24 +00:00
Daniel Cebrian	62a70dee2c	#11326 added new section and validated if exist plugin	2023-07-24 18:42:27 +02:00
Pablo Aragon	ccf124103d	11135-Move js code from ui_print_datatable. Resolve conflict	2023-07-24 10:46:19 +02:00
daniel	1bf7f1e36e	ITSM pandora_enterprise#11471	2023-07-21 14:23:42 +02:00
Daniel Cebrian	2d0fe4b149	#11326 added design	2023-07-20 15:13:58 +02:00
miguel angel rasteu	80b60eb86f	#11749 Fix agent count	2023-07-20 08:43:51 +02:00
daniel	3e2c2990df	Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria	2023-07-20 08:28:36 +02:00
daniel	9a72d0740c	ITSM fixed pandora_enterprise#11471	2023-07-18 15:13:08 +02:00
Daniel Maya	5806da78dd	#11487 Fixed subgroups	2023-07-18 10:18:30 +02:00
Rafael Ameijeiras	de84f5fae9	Merge branch 'ent-11418-cambiar-vista-de-graficas-del-detalle-de-un-agente' into 'develop' ... Ent 11418 cambiar vista de graficas del detalle de un agente See merge request artica/pandorafms!6014	2023-07-17 07:53:10 +00:00
Daniel Cebrian	0e2d1ee47f	#11326 security hardening	2023-07-12 15:54:04 +02:00
miguel angel rasteu	2af618b765	#11726 Fix alert status column name agent	2023-07-12 14:11:00 +02:00
Daniel Cebrian	0a34d06603	#10344 changed message in popup conexion check	2023-07-11 11:35:57 +02:00
Gorka Sanchez	8fd3ed6650	Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop' ... Ent 9478 creacion y edicion directa de alertas desde metaconsola See merge request artica/pandorafms!5806	2023-07-06 09:44:33 +00:00
Daniel Cebrian	951a468282	#11418 fixed id modules order in view graphs	2023-07-06 11:26:29 +02:00
Matias Didier	af2def1a62	Merge branch 'ent-11205-vista-de-incidencias-con-estilo-no-homogeneo' into 'develop' ... Ent 11205 vista de incidencias con estilo no homogeneo See merge request artica/pandorafms!5908	2023-07-04 14:02:13 +00:00
Jonathan	a385ff93a3	#9478 creation alerts to nodes on metaconsole	2023-07-04 12:47:04 +02:00
miguel angel rasteu	138fa636ad	#10637 Change group view	2023-07-04 11:06:49 +02:00
Gorka Sanchez	9427ba68e0	Merge branch 'ent-11314-vista-detalle-de-agente-cajas-colapsadas-por-defecto-si-no-hay-informacion' into 'develop' ... Ent 11314 vista detalle de agente cajas colapsadas por defecto si no hay informacion See merge request artica/pandorafms!5969	2023-07-04 08:53:12 +00:00
Jonathan	1c69208a6a	Merge branch 'develop' into ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola	2023-07-03 10:21:55 +02:00
Gorka Sanchez	ffc4f04989	Merge branch 'ent-11628-no-carga-el-total-amount-of-events-correctamente-si-hay-varios-widget-tactical-view' into 'develop' ... Ent 11628 no carga el total amount of events correctamente si hay varios widget tactical view See merge request artica/pandorafms!6154	2023-07-03 07:42:21 +00:00
Jonathan	5f8c2f1653	#11628 merge conflict solution	2023-07-03 09:34:04 +02:00
Gorka Sanchez	6a8a0e8b6f	Merge branch 'ent-11469-selector-de-modulos-comunes-en-wizard-de-servicios-no-anade-nada' into 'develop' ... Ent 11469 selector de modulos comunes en wizard de servicios no anade nada See merge request artica/pandorafms!6047	2023-07-03 07:33:05 +00:00
Jorge Rincon	ada52da898	#10850 agent detail view added to favorites system	2023-06-29 16:09:07 +02:00
Rafael Ameijeiras	d082687c44	Merge branch 'ent-10020-Eliminar-login-hash-de-vistas-metaconsola' into 'develop' ... Ent 10020 eliminar login hash de vistas metaconsola See merge request artica/pandorafms!5839	2023-06-29 09:55:53 +00:00
Matias Didier	63ee67bdff	Merge branch 'ent-11143-se-descoloca-menu-de-paginas-al-pasar-de-14' into 'develop' ... Ent 11143 se descoloca menu de paginas al pasar de 14 See merge request artica/pandorafms!5902	2023-06-27 13:24:37 +00:00
Matias Didier	ac25997f45	Merge branch 'ent-10963-icono-de-reset-erroneo' into 'develop' ... Ent 10963 icono de reset erroneo See merge request artica/pandorafms!5770	2023-06-27 12:16:36 +00:00
Rafael Ameijeiras	d0f33605e0	Merge branch 'ent-10815-operaciones-masivas-permiten-cambiar-parametros-que-deberian-estar-bloqueados-de-modulos-de' into 'develop' ... Ent 10815 operaciones masivas permiten cambiar parametros que deberian estar bloqueados de modulos de See merge request artica/pandorafms!5823	2023-06-27 12:07:15 +00:00
Matias Didier	fc3a0766f8	Merge branch 'ent-11152-parametro-de-filtro-de-monitor-detail-se-desmarca-solo' into 'develop' ... Ent 11152 parametro de filtro de monitor detail se desmarca solo See merge request artica/pandorafms!5886	2023-06-27 08:55:29 +00:00