Commit Graph

398 Commits

Author SHA1 Message Date
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
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 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
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
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
miguel angel rasteu db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu 1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu 64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu 933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Daniel Maya 6e8f0d1e93 #11469 Fixed add selected modules 2023-06-06 14:55:30 +02:00
alejandro.campos@artica.es 9c0ef3e5aa send login hash info in post body in meta links to node 2023-05-05 13:05:38 +02:00
alejandro.campos@artica.es 4cac880eca send login hash info in post body in meta links to node 2023-05-05 13:04:02 +02:00
Pablo Aragon 4f9e09b84a 10815-Bulk operations do not edit modules created with policies 2023-05-03 17:01:21 +02:00
Jonathan fdc13256cd #9478 create edit delete alerts from meta 2023-04-27 16:05:37 +02:00
daniel 086f742455 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
	pandora_console/operation/agentes/ver_agente.php
2023-04-10 16:42:41 +02:00
daniel 7302a108c0 fixed styles 2023-04-10 12:02:35 +02:00
Jonathan a0ae7327c7 Conflict solution inventory 2023-04-10 09:23:40 +02:00
Jonathan 17a9d6020f #10864 Solution conflict files removed 2023-04-05 12:52:44 +02:00
Calvo e2297171cb Process inventory modules with correct xml and empty data 2023-03-10 15:14:43 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
2023-03-03 08:20:44 +01:00
Diego Muñoz-Reja 873334fd97 Merge branch 'ent-9622-omnishell-en-la-vista-solapa-de-agente' into 'develop'
Ent 9622 omnishell en la vista solapa de agente

See merge request artica/pandorafms!5508
2023-03-02 14:52:45 +00:00
Jose Gonzalez a1bf42c9f9 Ticket 10470 Agent improvements 2023-02-17 14:21:29 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Pablo Aragon 6d85b912e2 9962-Omnishell in agent view 2023-02-06 16:34:40 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
Pablo Aragon 0ec58067ab 9220 Cast config['license_nms'] 2023-01-24 14:45:42 +01:00
Pablo Aragon d2c286fc4c 9220 Conflict resolved 2023-01-24 09:50:34 +01:00
Jonathan 532a90252c #9270 upgrades interface view + show interface on agent view 2023-01-18 13:44:40 +01:00
Pablo Aragon c503836634 Restrict access to collections with nms license 2023-01-12 12:28:40 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Calvo 566344ef0e Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 11:00:44 +01:00
Rafael Ameijeiras 19b74922a8 Merge branch 'ent-9587-busqueda-doble-en-vista-de-agentes' into 'develop'
Ent 9587 busqueda doble en vista de agentes

See merge request artica/pandorafms!5360
2022-12-28 09:56:34 +00:00
Jonathan 3caaf3a2a5 #9587 agent view - filter alerts when filter on list of modules 2022-12-28 10:03:31 +01:00
Pablo Aragon bbdc5b3e93 9664 Exclude pendingdelete modules from scheduled downtime 2022-12-27 15:22:39 +01:00
Calvo 63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +01:00
jose.gonzalez@pandorafms.com 4fd0115d80 Adapt views 2022-12-15 12:42:35 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com 7dce208df9 Update breadcrumbs for Agents and other minor fixes 2022-11-21 23:45:07 +01:00
jose.gonzalez@pandorafms.com 5aaa415ed9 Several fixes 2022-10-25 17:11:18 +02:00
jose.gonzalez@pandorafms.com 13b0c7d0c8 Fixed views 2022-10-25 13:13:52 +02:00
Jimmy Olano aaedb39849 Merge branch 'ent-9392-no-funciona-insertar-agentes-en-paradas-planificadas' into 'develop'
Fix planned downtime issues

Ref: pandora_enterprise#9392

See merge request artica/pandorafms!5166
2022-10-19 11:00:04 +00:00
Daniel Barbero 1acb67ecad fixed multi selector pandora_enterprise#8620 2022-10-18 13:40:09 +02:00
Calvo b29f7eb160 Fix planned downtime issues 2022-09-30 14:54:16 +02:00
Daniel Barbero 229436b972 fixed agent/module widget pandora_enterprise#9519 2022-09-19 14:40:31 +02:00
Calvo da0dad0148 WIP:Move inventory to open 2022-09-14 18:12:39 +02:00
Daniel Rodriguez a2c1b38a3f Merge branch 'ent-9011-Fallo-permisos-en-paradas-planificadas' into 'develop'
fixed permissions in selectors

See merge request artica/pandorafms!4931
2022-06-08 09:10:51 +00:00
alejandro.campos@artica.es 8b57e1dfb4 fixed permissions in selectors 2022-06-01 14:00:33 +02:00
José González 353e8773f8 Hide inventory view if agent dont have inventory modules 2022-05-26 08:13:30 +02:00